Changeset d5b48e6 in trunk

Timestamp:

2021-08-27T14:14:39Z (4 years ago)

Author:

Itamar Turner-Trauring <itamar@…>

Branches:

master

Children:

4c750cf

Parents:

bb48974f

Message:

Fix bug in jsonbytes.

Location:

src/allmydata

Files:

• test/test_util.py (modified) (1 diff)
• util/jsonbytes.py (modified) (1 diff)

src/allmydata/test/test_util.py ¶

@@ -559 +559 @@
         )
 
+    def test_dumps_bytes_unicode_separators(self):
+        """Unicode separators don't prevent the result from being bytes."""
+        result = jsonbytes.dumps_bytes([1, 2], separators=(u',', u':'))
+        self.assertIsInstance(result, bytes)
+        self.assertEqual(result, b"[1,2]")
+
 
 class FakeGetVersion(object):

src/allmydata/util/jsonbytes.py ¶

@@ -110 +110 @@
     """
     result = dumps(obj, *args, **kwargs)
-    if PY3:
+    if PY3 or isinstance(result, str):
         result = result.encode("utf-8")
     return result