Fixing up jsonify and adding unit tests

This commit is contained in:
James Cammarata 2016-02-29 14:51:23 -05:00
parent a9d25f455c
commit 7c049c3200
3 changed files with 60 additions and 6 deletions

View file

@ -29,17 +29,13 @@ def jsonify(result, format=False):
if result is None:
return "{}"
result2 = result.copy()
for key, value in result2.items():
if type(value) is str:
result2[key] = value.decode('utf-8', 'ignore')
indent = None
if format:
indent = 4
try:
return json.dumps(result2, sort_keys=True, indent=indent, ensure_ascii=False)
return json.dumps(result, sort_keys=True, indent=indent, ensure_ascii=False)
except UnicodeDecodeError:
return json.dumps(result2, sort_keys=True, indent=indent)
return json.dumps(result, sort_keys=True, indent=indent)