kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bugfix/clean-and-install

Browse Source
This commit is contained in:
Dan Ryan
2018-10-31 02:00:21 -04:00
parent 7882912c30 e3ee806bb0
commit f07e0550bb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
news/3131.bugfix.rst
+1
View File
@@ -0,0 +1 @@
Added additional logic for ignoring and replacing non-ascii characters when formatting console output on non-UTF-8 systems.
pipenv/_compat.py
+3 -2
View File
@@ -379,13 +379,14 @@ def decode_output(output):
return output
try:
output = output.encode(DEFAULT_ENCODING)
except (AttributeError, UnicodeDecodeError):
except (AttributeError, UnicodeDecodeError, UnicodeEncodeError):
if six.PY2:
output = unicode.translate(vistir.misc.to_text(output),
UNICODE_TO_ASCII_TRANSLATION_MAP)
else:
output = output.translate(UNICODE_TO_ASCII_TRANSLATION_MAP)
output = output.decode(DEFAULT_ENCODING)
output = output.encode(DEFAULT_ENCODING, "replace")
return vistir.misc.to_text(output, encoding=DEFAULT_ENCODING, errors="replace")
return output