From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 24 Jul 2015 14:19:20 +0000 (+0200)
Subject: fix more unicode
X-Git-Tag: 1.6a~4^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3bff9ace8582d9d45aef65862b65fd2a960451f9;p=telemeta.git

fix more unicode
---

diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index 8605fde9..a3e6c94e 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)
+            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