Changeset 4433

Timestamp:

01/27/07 07:42:51 (2 years ago)

Author:

russellm

Message:

Fixed a flaw in the serializers that prevented OneToOneFields? being serialized as JSON objects.

Files:

• django/trunk/django/core/serializers/python.py (modified) (1 diff)
• django/trunk/tests/modeltests/serializers/models.py (modified) (2 diffs)

django/trunk/django/core/serializers/python.py

@@ -58 +58 @@
-        # Look up the model and starting build a dict of data for it.
-        Model = _get_model(d["model"])
-
+att
-        m2m_data = {}
-        

django/trunk/tests/modeltests/serializers/models.py

@@ -37 +37 @@
-    def __str__(self):
-        return self.headline
+
+class AuthorProfile(models.Model):
+    author = models.OneToOneField(Author)
+    date_of_birth = models.DateField()
+    
+    def __str__(self):
+        return "Profile of %s" % self.author
-
-__test__ = {'API_TESTS':"""
@@ -119 +126 @@
-[<Article: Just kidding; I love TV poker>, <Article: Time to reform copyright>]
-
+# If you use your own primary key field (such as a OneToOneField), 
+# it doesn't appear in the serialized field list - it replaces the
+# pk identifier.
+>>> profile = AuthorProfile(author=joe, date_of_birth=datetime(1970,1,1))
+>>> profile.save()
+
+>>> json = serializers.serialize("json", AuthorProfile.objects.all())
+>>> json
+'[{"pk": "1", "model": "serializers.authorprofile", "fields": {"date_of_birth": "1970-01-01"}}]'
+
+>>> for obj in serializers.deserialize("json", json):
+...     print obj
+<DeserializedObject: Profile of Joe>
+
-"""}