Ticket #11970: patch.diff

server/lib/django-1.1/django/core/serializers/json.py

@@ -7 +7 @@
 
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
+from django.core.serializers import base
 from django.utils import datetime_safe
 from django.utils import simplejson
 
@@ -38 +39 @@
         stream = StringIO(stream_or_string)
     else:
         stream = stream_or_string
-    for obj in PythonDeserializer(simplejson.load(stream)):
-        yield obj
+    try:
+        for obj in PythonDeserializer(simplejson.load(stream)):
+            yield obj
+    except ValueError, e:
+        # Map to deserializer error
+        raise base.DeserializationError(e.args)
 
 class DjangoJSONEncoder(simplejson.JSONEncoder):
     """