Merge pull request #1189 from allmightyspiff/issues771

Issues771 - Fixing windows Unicode Errors

Author: allmightyspiff

SoftLayer/CLI/environment.py

@@ -46,14 +46,20 @@ def err(self, output, newline=True):
         """Outputs an error string to the console (stderr)."""
         click.echo(output, nl=newline, err=True)
 
-    def fmt(self, output):
+    def fmt(self, output, fmt=None):
         """Format output based on current the environment format."""
-        return formatting.format_output(output, fmt=self.format)
+        if fmt is None:
+            fmt = self.format
+        return formatting.format_output(output, fmt)
 
     def fout(self, output, newline=True):
         """Format the input and output to the console (stdout)."""
         if output is not None:
-            self.out(self.fmt(output), newline=newline)
+            try:
+                self.out(self.fmt(output), newline=newline)
+            except UnicodeEncodeError:
+                # If we hit an undecodeable entry, just try outputting as json.
+                self.out(self.fmt(output, 'json'), newline=newline)
 
     def input(self, prompt, default=None, show_default=True):
         """Provide a command prompt."""

tests/CLI/environment_tests.py

@@ -62,3 +62,14 @@ def test_resolve_alias(self):
 
         r = self.env.resolve_alias('realname')
         self.assertEqual(r, 'realname')
+
+    @mock.patch('click.echo')
+    def test_print_unicode(self, echo):
+        output = "\u3010TEST\u3011 image"
+        # https://docs.python.org/3.6/library/exceptions.html#UnicodeError
+        echo.side_effect = [
+            UnicodeEncodeError('utf8', output, 0, 1, "Test Exception"),
+            output
+        ]
+        self.env.fout(output)
+        self.assertEqual(2, echo.call_count)