Merge removal of complex_args_hack

This commit is contained in:
Toshio Kuratomi
2014-10-08 15:03:43 -04:00
6 changed files with 32 additions and 44 deletions

View File

@@ -1216,24 +1216,6 @@ def to_unicode(value):
return value
return value.decode("utf-8")
def json_dict_unicode_to_bytes(d):
''' Recursively convert dict keys and values to byte str
Specialized for json return because this only handles, lists, tuples,
and dict container types (the containers that the json module returns)
'''
if isinstance(d, unicode):
return d.encode('utf-8')
elif isinstance(d, dict):
return dict(map(json_dict_unicode_to_bytes, d.iteritems()))
elif isinstance(d, list):
return list(map(json_dict_unicode_to_bytes, d))
elif isinstance(d, tuple):
return tuple(map(json_dict_unicode_to_bytes, d))
else:
return d
def get_diff(diff):
# called by --diff usage in playbook and runner via callbacks