Ticket #4227: core_serializers.diff

xml_serializer.py

@@ -68 +68 @@
         # serializer base class). 
         if getattr(obj, field.name) is not None:
             value = self.get_string_value(obj, field)
-            self.xml.characters(str(value))
+            self.xml.characters(value)
         else:
             self.xml.addQuickElement("None")
 
@@ -226 +226 @@
             inner_text.extend(getInnerText(child))
         else:
            pass
-    return "".join(inner_text)
- No newline at end of file
+    return "".join(inner_text)

base.py

@@ -7 +7 @@
 except ImportError:
     from StringIO import StringIO
 from django.db import models
+from django.conf import settings
 
 class SerializationError(Exception):
     """Something bad happened during serialization."""
@@ -59 +60 @@
             value = getattr(obj, "get_%s_url" % field.name, lambda: None)()
         else:
             value = field.flatten_data(follow=None, obj=obj).get(field.name, "")
-        return str(value)
 
+        if isinstance(value, str):
+            return value.decode(settings.DEFAULT_CHARSET)
+        else:
+            return unicode(value)
+
     def start_serialization(self):
         """
         Called when serializing of the queryset starts.