cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Properly catch and decode unicode strings in module _log_invocation()

Browse source 
Fixes #7084
This commit is contained in:
James Cammarata 2014-04-21 11:32:22 -05:00
parent 4f673b9497
commit 68c30548e0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/basic.py
View file

@ -828,8 +828,8 @@ class AnsibleModule(object):
module = 'ansible-%s' % os.path.basename(__file__) module = 'ansible-%s' % os.path.basename(__file__)
msg = '' msg = ''
for arg in log_args: for arg in log_args:
if isinstance(log_args[arg], unicode): if isinstance(log_args[arg], basestring):
msg = msg + arg + '=' + log_args[arg] + ' ' msg = msg + arg + '=' + log_args[arg].decode('utf-8') + ' '
else: else:
msg = msg + arg + '=' + str(log_args[arg]) + ' ' msg = msg + arg + '=' + str(log_args[arg]) + ' '
if msg: if msg:
@ -839,7 +839,7 @@ class AnsibleModule(object):
# 6655 - allow for accented characters # 6655 - allow for accented characters
try: try:
msg = unicode(msg).encode('utf8') msg = msg.encode('utf8')
except UnicodeDecodeError, e: except UnicodeDecodeError, e:
pass pass