ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-27 14:50:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in jsonbytes.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-08-27 10:14:39 -04:00
parent bb48974fd8
commit d5b48e65c7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/test/test_util.py
View File

@ -558,6 +558,12 @@ class JSONBytes(unittest.TestCase):
expected expected
) )
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): class FakeGetVersion(object):
"""Emulate an object with a get_version.""" """Emulate an object with a get_version."""

2
src/allmydata/util/jsonbytes.py
View File

@ -109,7 +109,7 @@ def dumps_bytes(obj, *args, **kwargs):
human consumption. human consumption.
""" """
result = dumps(obj, *args, **kwargs) result = dumps(obj, *args, **kwargs)
if PY3: if PY3 or isinstance(result, str):
result = result.encode("utf-8") result = result.encode("utf-8")
return result return result