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
This commit is contained in:
parent
d6afb5d80e
commit
a00056723f
2 changed files with 15 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue