Merge pull request #7481 from bluetech/tw-unicode-escape

terminalwriter: bring back handling of printing characters not supported by stdout
2020-07-11 16:01:45 -03:00
parent 7f467ebc9a 113339b029
commit 07f5f6fd4a
2 changed files with 21 additions and 1 deletions
@@ -149,7 +149,18 @@ class TerminalWriter:

            msg = self.markup(msg, **markup)

-            self._file.write(msg)
+            try:
+                self._file.write(msg)
+            except UnicodeEncodeError:
+                # Some environments don't support printing general Unicode
+                # strings, due to misconfiguration or otherwise; in that case,
+                # print the string escaped to ASCII.
+                # When the Unicode situation improves we should consider
+                # letting the error propagate instead of masking it (see #7475
+                # for one brief attempt).
+                msg = msg.encode("unicode-escape").decode("ascii")
+                self._file.write(msg)
+
            if flush:
                self.flush()