Merge a9ebf91 into 73872d9

green/output.py

@@ -6,6 +6,7 @@
 import platform
 import sys
 import termstyle
+from unidecode import unidecode
 
 global debug_level
 debug_level = 0
@@ -141,6 +142,7 @@ class GreenStream(object):
     """
 
     indent_spaces = 2
+    _ascii_only_output = False  # default to printing output in unicode
 
     def __init__(self, stream, override_appveyor=False, disable_windows=False):
         self.stream = stream
@@ -153,6 +155,8 @@ def __init__(self, stream, override_appveyor=False, disable_windows=False):
                 or ((on_windows and not on_appveyor)
                     and not disable_windows)): # pragma: no cover
             self.stream = wrap_stream(self.stream, None, None, None, True)
+            # set output is ascii-only
+            self._ascii_only_output = True
         self.closed = False
 
 
@@ -167,6 +171,9 @@ def writeln(self, text=''):
     def write(self, text):
         if type(text) == bytes:
             text = text.decode('utf-8')
+        # Compensate for windows' anti-social unicode behavior
+        if self._ascii_only_output:
+            text = unidecode(text)
         self.stream.write(text)
 
 

green/test/test_output.py

@@ -8,6 +8,11 @@
 except:
     from StringIO import StringIO
 
+try:
+    from unittest.mock import patch
+except:
+    from mock import patch
+
 from green.output import Colors, GreenStream, debug
 import green.output
 
@@ -141,3 +146,15 @@ def testDisableWindowsFalse(self):
         import colorama
         self.assertTrue(issubclass(type(gs.stream),
                         colorama.ansitowin32.StreamWrapper))
+
+
+    @patch('green.output.unidecode')
+    def testUnidecodeAppveyor(self, mock_unidecode):
+        """
+        When I'm on Appveyor, I run text through Unidecode
+        """
+        mock_unidecode.return_value = 'something'
+        s = StringIO()
+        gs = GreenStream(s, override_appveyor=True)
+        gs.write('something')
+        self.assertTrue(mock_unidecode.called)

green/test/test_windows.py

@@ -22,4 +22,3 @@ def test_colorOutput(self):
         gs = GreenStream(sys.stdout, override_appveyor=True)
         self.assertTrue(issubclass(type(gs.stream),
                         colorama.ansitowin32.StreamWrapper))
-

requirements.txt

@@ -1,3 +1,4 @@
 colorama
 mock
 python-termstyle
+unidecode

setup.py

@@ -12,6 +12,7 @@
 dependencies = [
     'colorama',
     'python-termstyle',
+    'unidecode',
 ]
 if sys.version_info[0] == 2:
     dependencies.append('mock')