Merge branch 'alozovskoy-alozovskoy-debug-ascii-patch' into devel

lib/ansible/utils/__init__.py

@@ -207,10 +207,15 @@ def jsonify(result, format=False):
     for key, value in result2.items():
         if type(value) is str:
             result2[key] = value.decode('utf-8', 'ignore')
+
+    indent = None
     if format:
-        return json.dumps(result2, sort_keys=True, indent=4)
+        indent = 4
-    else:
+
-        return json.dumps(result2, sort_keys=True)
+    try:
+        return json.dumps(result2, sort_keys=True, indent=indent, ensure_ascii=False)
+    except UnicodeDecodeError:
+        return json.dumps(result2, sort_keys=True, indent=indent)
 
 def write_tree_file(tree, hostname, buf):
     ''' write something into treedir/hostname '''