Use stream encoding instead of locale preferred encoding

better_exceptions/__init__.py

@@ -17,9 +17,8 @@
 import sys
 
 from .formatter import THEME, MAX_LENGTH, PIPE_CHAR, CAP_CHAR, ExceptionFormatter
-from .encoding import to_byte
 from .context import PY3
-from .color import SUPPORTS_COLOR, SHOULD_ENCODE, STREAM
+from .color import SUPPORTS_COLOR, SHOULD_ENCODE, STREAM, to_byte
 from .log import BetExcLogger, patch as patch_logging
 from .repl import interact, get_repl
 

better_exceptions/color.py

@@ -6,20 +6,45 @@
 
 from __future__ import absolute_import
 
+import codecs
 import errno
 import os
 import struct
 import sys
 
 from .context import PY3
-from .encoding import to_byte as _byte
 
 
 STREAM = sys.stderr
+ENCODING = getattr(STREAM, "encoding", None) or "utf-8"
 SHOULD_ENCODE = True
 SUPPORTS_COLOR = False
 
 
+def to_byte(val):
+    unicode_type = str if PY3 else unicode
+    if isinstance(val, unicode_type):
+        try:
+            return val.encode(ENCODING)
+        except UnicodeEncodeError:
+            if PY3:
+                return codecs.escape_decode(val)[0]
+            else:
+                return val.encode("unicode-escape").decode("string-escape")
+
+    return val
+
+
+def to_unicode(val):
+    if isinstance(val, bytes):
+        try:
+            return val.decode(ENCODING)
+        except UnicodeDecodeError:
+            return val.decode("unicode-escape")
+
+    return val
+
+
 def get_terminfo_file():
     term = os.getenv('TERM', None)
 
@@ -65,7 +90,7 @@ def __getattr__(self, name):
         return getattr(self.__wrapped, name)
 
     def write(self, text):
-        data = _byte(text)
+        data = to_byte(text)
         self.__wrapped.buffer.write(data)
 
 

better_exceptions/formatter.py

@@ -9,9 +9,8 @@
 import sys
 import traceback
 
-from .color import STREAM, SUPPORTS_COLOR
+from .color import ENCODING, STREAM, SUPPORTS_COLOR, to_byte, to_unicode
 from .context import PY3
-from .encoding import ENCODING, to_byte, to_unicode
 from .repl import get_repl
 
 

test_all.sh

@@ -60,10 +60,7 @@ for encoding in ascii "UTF-8"; do
 			[[ $color == "1" ]] && color_filename="color" || color_filename="nocolor"
 			filename="test/output/python3-${term}-${encoding}-${color_filename}.out"
 
-			export LANG="en_US.${encoding}"
-			export LC_ALL="${LANG}"
-			export PYTHONCOERCECLOCALE=0
-			export PYTHONUTF8=0
+			export PYTHONIOENCODING="${encoding}"
 			export TERM="${term}"
 			export FORCE_COLOR="${color}"