External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-17 00:47:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-986 Replaced use of str() with unicode() in model dict/diff functions.

Browse Source
This commit is contained in:
Chris Church
2014-01-27 14:23:32 -05:00
parent 5ea87d28fb
commit ff40234a9b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/utils.py
View File

@@ -263,12 +263,12 @@ def model_instance_diff(old, new, serializer_mapping=None):
if old_value != new_value and field not in Credential.PASSWORD_FIELDS: if old_value != new_value and field not in Credential.PASSWORD_FIELDS:
if type(old_value) not in (bool, int, type(None)): if type(old_value) not in (bool, int, type(None)):
old_value = str(old_value) old_value = unicode(old_value)
if type(new_value) not in (bool, int, type(None)): if type(new_value) not in (bool, int, type(None)):
new_value = str(new_value) new_value = unicode(new_value)
diff[field] = (old_value, new_value) diff[field] = (old_value, new_value)
elif old_value != new_value and field in Credential.PASSWORD_FIELDS: elif old_value != new_value and field in Credential.PASSWORD_FIELDS:
diff[field] = ("hidden", "hidden") diff[field] = (u"hidden", u"hidden")
if len(diff) == 0: if len(diff) == 0:
diff = None diff = None
@@ -294,7 +294,7 @@ def model_to_dict(obj, serializer_mapping=None):
if field.name not in Credential.PASSWORD_FIELDS: if field.name not in Credential.PASSWORD_FIELDS:
field_val = getattr(obj, field.name, None) field_val = getattr(obj, field.name, None)
if type(field_val) not in (bool, int, type(None)): if type(field_val) not in (bool, int, type(None)):
attr_d[field.name] = str(field_val) attr_d[field.name] = unicode(field_val)
else: else:
attr_d[field.name] = field_val attr_d[field.name] = field_val
else: else: