Ticket #4714: json.diff

django/core/serializers/python.py

@@ -13 +13 @@
-    """
-    Serializes a QuerySet to basic Python objects.
-    """
+    
+    def str_to_unicode(self, val):
+        """ Converts all strings to unicode and leaves other types as they are
+            smart_unicode(strings_only=True, ...) is not used as it only
+            recognizes 'types.NoneType' and 'int' as not strings
+        """
+        if not isinstance(val, basestring,):
+            return val
+        return smart_unicode(val)
-
-    def start_serialization(self):
-        self._current = None
@@ -27 +36 @@
-    def end_object(self, obj):
-        self.objects.append({
-            "model"  : smart_unicode(obj._meta),
-mart
+elf.str_to
-            "fields" : self._current
-        })
-        self._current = None
-
-    def handle_field(self, obj, field):
-getattr(obj, field.name
+self.str_to_unicode(getattr(obj, field.name)
-
-    def handle_fk_field(self, obj, field):
-        related = getattr(obj, field.name)
@@ -44 +53 @@
-            else:
-                # Related to remote object via other field
-                related = getattr(related, field.rel.field_name)
-related
+self.str_to_unicode(related)
-
-    def handle_m2m_field(self, obj, field):
-
+
+
-
-    def getvalue(self):
-        return self.objects

tests/modeltests/serializers/models.py

@@ +1 @@
+# -*- coding: utf-8 -*-
-"""
-41. Serialization
-
@@ -43 +44 @@
-    
-    def __unicode__(self):
-        return u"Profile of %s" % self.author
+        
+class Actor(models.Model):
+    name = models.CharField(max_length=20, primary_key=True)
-
+    class Meta:
+        ordering = ('name',)
+    
+    def __unicode__(self):
+        return self.name
+    
+class Movie(models.Model):
+    actor = models.ForeignKey(Actor)
+    title = models.CharField(max_length=50)
+
+    class Meta:
+       ordering = ('title',)
+
+    def __unicode__(self):
+        return self.title
+
-__test__ = {'API_TESTS':"""
-# Create some data:
->>> from datetime import datetime
@@ -101 +121 @@
-# Django also ships with a built-in JSON serializers
->>> json = serializers.serialize("json", Category.objects.filter(pk=2))
->>> json
-"2"
+2
-
-# You can easily create new objects by deserializing data with an empty PK
-# (It's easier to demo this with JSON...)
@@ -133 +153 @@
-
->>> json = serializers.serialize("json", AuthorProfile.objects.all())
->>> json
-"1"
+1
-
->>> for obj in serializers.deserialize("json", json):
-...     print obj
@@ -141 +161 @@
-
-# Objects ids can be referenced before they are defined in the serialization data
-# However, the deserialization process will need to be contained within a transaction
-"3", "model": "serializers.article", "fields": {"headline": "Forward references pose no problem", "pub_date": "2006-06-16 15:00:00", "categories": [4, 1], "author": 4}}, {"pk": "4", "model": "serializers.category", "fields": {"name": "Reference"}}, {"pk": "4"
+3, "model": "serializers.article", "fields": {"headline": "Forward references pose no problem", "pub_date": "2006-06-16 15:00:00", "categories": [4, 1], "author": 4}}, {"pk": 4, "model": "serializers.category", "fields": {"name": "Reference"}}, {"pk": 4
->>> from django.db import transaction
->>> transaction.enter_transaction_management()
->>> transaction.managed(True)
@@ -161 +181 @@
-
-# Serializer output can be restricted to a subset of fields
->>> print serializers.serialize("json", Article.objects.all(), fields=('headline','pub_date'))
-"1", "model": "serializers.article", "fields": {"headline": "Just kidding; I love TV poker", "pub_date": "2006-06-16 11:00:00"}}, {"pk": "2", "model": "serializers.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": "3"
+1, "model": "serializers.article", "fields": {"headline": "Just kidding; I love TV poker", "pub_date": "2006-06-16 11:00:00"}}, {"pk": 2, "model": "serializers.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": 3
-
+# Every string is serialized as a unicode object, also primary key 
+# which is 'varchar'
+>>> ac = Actor(name="Zażółć")
+>>> mv = Movie(title="Gęślą jaźń", actor=ac)
+>>> ac.save(); mv.save()
+
+# Let's serialize our movie
+>>> print serializers.serialize("json", [mv])
+[{"pk": 1, "model": "serializers.movie", "fields": {"actor": "Za\u017c\u00f3\u0142\u0107", "title": "G\u0119\u015bl\u0105 ja\u017a\u0144"}}]
+
+# Deserialization of movie
+>>> list(serializers.deserialize('json', serializers.serialize('json', [mv])))[0].object.title
+u'G\u0119\u015bl\u0105 ja\u017a\u0144'
+
+# None is null after serialization to json
+# Primary key is None in case of not saved model
+>>> mv2 = Movie(title="Movie 2", actor=ac)
+>>> print serializers.serialize("json", [mv2])
+[{"pk": null, "model": "serializers.movie", "fields": {"actor": "Za\u017c\u00f3\u0142\u0107", "title": "Movie 2"}}]
+
+# Deserialization of null returns None for pk
+>>> print list(serializers.deserialize('json', serializers.serialize('json', [mv2])))[0].object.id
+None
+
-"""}

tests/modeltests/fixtures/models.py

@@ -74 +74 @@
-
-# Dump the current contents of the database as a JSON fixture
->>> management.call_command('dumpdata', 'fixtures', format='json')
-"3", "model": "fixtures.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": "2", "model": "fixtures.article", "fields": {"headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00"}}, {"pk": "1"
+3, "model": "fixtures.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": 2, "model": "fixtures.article", "fields": {"headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00"}}, {"pk": 1
-"""}
-
-from django.test import TestCase