ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-21 20:08:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

decode instead of encoding in maybe_decode

Browse Source 
legacy from when the bytes/unicode tower was upsidedown compared to how it is now
This commit is contained in:
Jean-Paul Calderone 2020-12-07 09:12:04 -05:00
parent 72a5b571ca
commit 56f141e170
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/allmydata/test/common_util.py
View File

@ -109,10 +109,10 @@ def run_cli_unicode(verb, argv, nodeargs=None, stdin=None, encoding=None):
)
def maybe_decode(result):
code, stdout, stderr = result
if isinstance(stdout, unicode):
stdout = stdout.encode("utf-8")
if isinstance(stderr, unicode):
stderr = stderr.encode("utf-8")
if isinstance(stdout, bytes):
stdout = stdout.decode(encoding)
if isinstance(stderr, bytes):
stderr = stderr.decode(encoding)
return code, stdout, stderr
d.addCallback(maybe_decode)
return d