Fixed #11970 -- Wrapped the exception happening during deserialization in DeserializationError exceptions. Thanks, Claude Paroz.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17469 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 16 insertions, 5 deletions

diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py
index 7b570f36d8..ce7cdb3179 100644
--- a/django/core/serializers/json.py
+++ b/django/core/serializers/json.py
@@ -6,6 +6,7 @@ import datetime
 import decimal
 from StringIO import StringIO
 
+from django.core.serializers.base import DeserializationError
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
 from django.utils import simplejson
@@ -27,6 +28,7 @@ class Serializer(PythonSerializer):
         if callable(getattr(self.stream, 'getvalue', None)):
             return self.stream.getvalue()
 
+
 def Deserializer(stream_or_string, **options):
     """
     Deserialize a stream or string of JSON data.
@@ -35,8 +37,13 @@ def Deserializer(stream_or_string, **options):
         stream = StringIO(stream_or_string)
     else:
         stream = stream_or_string
-    for obj in PythonDeserializer(simplejson.load(stream), **options):
-        yield obj
+    try:
+        for obj in PythonDeserializer(simplejson.load(stream), **options):
+            yield obj
+    except Exception, e:
+        # Map to deserializer error
+        raise DeserializationError(e)
+
 
 class DjangoJSONEncoder(simplejson.JSONEncoder):
     """
diff --git a/django/core/serializers/pyyaml.py b/django/core/serializers/pyyaml.py
index a9f4575823..1f4f967ebb 100644
--- a/django/core/serializers/pyyaml.py
+++ b/django/core/serializers/pyyaml.py
@@ -9,6 +9,7 @@ import decimal
 import yaml
 
 from django.db import models
+from django.core.serializers.base import DeserializationError
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
 
@@ -51,6 +52,9 @@ def Deserializer(stream_or_string, **options):
         stream = StringIO(stream_or_string)
     else:
         stream = stream_or_string
-    for obj in PythonDeserializer(yaml.safe_load(stream), **options):
-        yield obj
-
+    try:
+        for obj in PythonDeserializer(yaml.safe_load(stream), **options):
+            yield obj
+    except Exception, e:
+        # Map to deserializer error
+        raise DeserializationError(e)