Ticket #5553: json.diff

django/utils/encoding.py

@@ -1 +1 @@
-import types
-import urllib
+import datetime
-from django.utils.functional import Promise
-
-class StrAndUnicode(object):
@@ -30 +31 @@
-
-    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,):
-        if hasattr(s, '__unicode__'):

tests/modeltests/serializers/models.py

@@ -63 +63 @@
-
-    def __unicode__(self):
-        return self.title
+        
+class Score(models.Model):
+    score = models.FloatField()
-
-__test__ = {'API_TESTS':"""
-# Create some data:
@@ -83 +86 @@
->>> a2 = Article(
-...     author = joe,
-...     headline = "Time to reform copyright",
-
+, 11, 345
->>> a1.save(); a2.save()
->>> a1.categories = [sports, op_ed]
->>> a2.categories = [music, op_ed]
@@ -181 +184 @@
-
-# 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 
-# which is 'varchar'
@@ -207 +210 @@
->>> print list(serializers.deserialize('json', serializers.serialize('json', [mv2])))[0].object.id
-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
+
-"""}