From ff40234a9bd266aeffdcf643cca274700f9d67e6 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Mon, 27 Jan 2014 14:23:32 -0500 Subject: [PATCH] AC-986 Replaced use of str() with unicode() in model dict/diff functions. --- awx/main/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/utils.py b/awx/main/utils.py index 82b2eef804..88c11646f0 100644 --- a/awx/main/utils.py +++ b/awx/main/utils.py @@ -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 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)): - new_value = str(new_value) + new_value = unicode(new_value) diff[field] = (old_value, new_value) 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: diff = None @@ -294,7 +294,7 @@ def model_to_dict(obj, serializer_mapping=None): if field.name not in Credential.PASSWORD_FIELDS: field_val = getattr(obj, field.name, 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: attr_d[field.name] = field_val else: