ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 07:31:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

On Python 2 we don't need to convert byte keys to unicode.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-07-05 16:35:06 -07:00
parent 203652d087
commit af49dcb89e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/allmydata/util/log.py
View File

@ -18,7 +18,14 @@ from pyutil import nummedobj
from foolscap.logging import log from foolscap.logging import log
from twisted.python import log as tw_log from twisted.python import log as tw_log
from .jsonbytes import bytes_to_unicode if PY2:
def bytes_to_unicode(ign, obj):
return obj
else:
# We want to convert bytes keys to Unicode, otherwise JSON serialization
# inside foolscap will fail (for details see
# https://github.com/warner/foolscap/issues/88)
from .jsonbytes import bytes_to_unicode
NOISY = log.NOISY # 10 NOISY = log.NOISY # 10