Changeset 6406

Timestamp:

09/22/07 08:21:54 (10 months ago)

Author:

russellm

Message:

Fixed #5553 -- Fixed a serialization problem with datetime and time objects. Thanks to pigletto for the patch.

Files:

• django/trunk/django/utils/encoding.py (modified) (2 diffs)
• django/trunk/tests/modeltests/serializers/models.py (modified) (4 diffs)

django/trunk/django/utils/encoding.py

@@ -1 +1 @@
-import types
-import urllib
+import datetime
-from django.utils.functional import Promise
-
@@ -31 +32 @@
-    If strings_only is True, don't convert (some) non-string-like objects.
-    """
-
+, datetime.datetime, datetime.time, float
-        return s
-    if not isinstance(s, basestring,):

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

@@ -64 +64 @@
-    def __unicode__(self):
-        return self.title
+        
+class Score(models.Model):
+    score = models.FloatField()
-
-__test__ = {'API_TESTS':"""
@@ -84 +87 @@
-...     author = joe,
-...     headline = "Time to reform copyright",
-
+, 11, 345
->>> a1.save(); a2.save()
->>> a1.categories = [sports, op_ed]
@@ -182 +185 @@
-# Serializer output can be restricted to a subset of fields
->>> print serializers.serialize("json", Article.objects.all(), fields=('headline','pub_date'))
-00
+11
-
-# Every string is serialized as a unicode object, also primary key 
@@ -209 +212 @@
-None
-
+# Serialization and deserialization of floats:
+>>> sc = Score(score=3.4)
+>>> print serializers.serialize("json", [sc])
+[{"pk": null, "model": "serializers.score", "fields": {"score": 3.4}}]
+>>> print list(serializers.deserialize('json', serializers.serialize('json', [sc])))[0].object.score
+3.4
+
-"""}