simpler safe output

arizvisa · Oct 8, 2015 · 4463ced · 4463ced
1 parent de792ba
commit 4463ced
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py
@@ -236,12 +236,13 @@ def prompt(self, msg):
 
     def _safe_output(self, msg, stderr=False):
 
+        encoding='utf-8'
         if not stderr and sys.stdout.encoding:
-            msg = to_bytes(msg, sys.stdout.encoding)
+            encoding = sys.stdout.encoding
         elif stderr and sys.stderr.encoding:
-            msg = to_bytes(msg, sys.stderr.encoding)
-        else:
-            msg = to_bytes(msg)
+            encoding = sys.stderr.encoding
+
+        msg = to_bytes(msg, encoding)
 
         return msg