ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-22 02:16:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Oops there's another case

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-12-06 18:39:09 -05:00
parent 2955d22f72
commit 5aee8b422d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/allmydata/scripts/tahoe_add_alias.py
View File

@ -100,10 +100,12 @@ def create_alias(options):
def show_output(fp, template, **kwargs):
assert isinstance(template, unicode)
# On Python 2 and Python 3 fp has an encoding attribute under real usage
# but the test suite passes StringIO in many places which has no such
# attribute. Make allowances for this until the test suite is fixed.
encoding = getattr(fp, "encoding", "utf-8")
# On Python 3 fp has an encoding attribute under all real usage. On
# Python 2, the encoding attribute is None if stdio is not a tty. The
# test suite often passes StringIO which has no such attribute. Make
# allowances for this until the test suite is fixed and Python 2 is no
# more.
encoding = getattr(fp, "encoding", None) or "utf-8"
output = template.format(**{
k: quote_output_u(v, encoding=encoding)
for (k, v)