From aaa25eb75c84662d0d496188e143bc616e60ecc5 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Wed, 25 Mar 2015 12:22:45 -0700
Subject: [PATCH] Make run_command() work when we get byte str with non-ascii
 characters (instead of unicode type like we were expecting)

Fix and test.

Fixes #10536
---
 lib/ansible/module_utils/basic.py | 7 ++++++-
 test/integration/unicode.yml      | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py
index b68a36b9c65..ad1d43f86ca 100644
--- a/lib/ansible/module_utils/basic.py
+++ b/lib/ansible/module_utils/basic.py
@@ -1457,7 +1457,12 @@ class AnsibleModule(object):
         # in reporting later, which strips out things like
         # passwords from the args list
         if isinstance(args, basestring):
-            to_clean_args = shlex.split(args.encode('utf-8'))
+            if isinstance(args, unicode):
+                b_args = args.encode('utf-8')
+            else:
+                b_args = args
+            to_clean_args = shlex.split(b_args)
+            del b_args
         else:
             to_clean_args = args
 
diff --git a/test/integration/unicode.yml b/test/integration/unicode.yml
index b04d760182c..1044c252705 100644
--- a/test/integration/unicode.yml
+++ b/test/integration/unicode.yml
@@ -41,6 +41,15 @@
     - name: 'A task with unicode host vars'
       debug: var=unicode_host_var
 
+    - name: 'A task with unicode shell parameters'
+      shell: echo '¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö ×'
+      register: output
+
+    - name: 'Assert that the unicode was echoed'
+      assert:
+        that:
+          - "'¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö ×' in output.stdout_lines"
+
 - name: 'A play for hosts in group: ĪīĬĭ'
   hosts: 'ĪīĬĭ'
   gather_facts: true