fix more unicode

diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index 8605fde9c498f2c51701285acab9b7fac1c907c6..a3e6c94ec41154c5ac1104214793fd502d0f89f5 100644 (file)
--- 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)
+            value = unicode(value.decode('utf-8'))
             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))
+            fields_dict[field.name] = unicode(getattr(self, field.name).decode('utf-8'))
         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))})
+            fields_list.append({'name': field.name, 'value': unicode(getattr(self, field.name).decode('utf-8'))})
         return fields_list
 
     @classmethod