From: Guillaume Pellerin Date: Tue, 28 Jul 2015 21:17:38 +0000 (+0200) Subject: unicode regression on model serializers X-Git-Tag: 1.6a~4^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Fdev;p=telemeta.git unicode regression on model serializers --- diff --git a/telemeta/models/core.py b/telemeta/models/core.py index a3e6c94e..8605fde9 100644 --- a/telemeta/models/core.py +++ b/telemeta/models/core.py @@ -174,7 +174,7 @@ class ModelCore(EnhancedModel): element = doc.createElement(self.get_dom_field_name(name)) if isinstance(value, EnhancedModel): element.setAttribute('key', str(value.pk)) - value = unicode(value.decode('utf-8')) + value = unicode(value) element.appendChild(doc.createTextNode(value)) top.appendChild(element) return doc @@ -183,14 +183,14 @@ class ModelCore(EnhancedModel): "Return model fields as a dict of name/value pairs" fields_dict = {} for field in self._meta.fields: - fields_dict[field.name] = unicode(getattr(self, field.name).decode('utf-8')) + fields_dict[field.name] = unicode(getattr(self, field.name)) return fields_dict def to_list(self): "Return model fields as a list" fields_list = [] for field in self._meta.fields: - fields_list.append({'name': field.name, 'value': unicode(getattr(self, field.name).decode('utf-8'))}) + fields_list.append({'name': field.name, 'value': unicode(getattr(self, field.name))}) return fields_list @classmethod