Merge pull request #3132 from pypa/bugfix/3131-better-output-encoding

Fix unicode encoding to replace non-ascii chars
pypa · Oct 31, 2018 · e3ee806 · e3ee806
2 parents 8bda09e + 8c659f1
commit e3ee806
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/news/3131.bugfix.rst b/news/3131.bugfix.rst
@@ -0,0 +1 @@
+Added additional logic for ignoring and replacing non-ascii characters when formatting console output on non-UTF-8 systems.
diff --git a/pipenv/_compat.py b/pipenv/_compat.py
@@ -379,11 +379,12 @@ 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