diff options
author | konarkmodi <modi.konark@gmail.com> | 2013-03-19 10:34:59 +0530 |
---|---|---|
committer | Carl Meyer <carl@oddbird.net> | 2013-03-19 15:42:39 -0700 |
commit | bc4111ba68e5eede1f68882a16d68441a845e30b (patch) | |
tree | 0b7689470b8ff28cdaee5fbe5053b81c720fd497 /django/core/serializers/json.py | |
parent | 1fe90b281baa1601e4582fd9454b92740e527d89 (diff) | |
download | django-bc4111ba68e5eede1f68882a16d68441a845e30b.tar.gz |
Fixed #18003 -- Preserved tracebacks when re-raising errors.
Thanks jrothenbuhler for draft patch, Konark Modi for updates.
Diffstat (limited to 'django/core/serializers/json.py')
-rw-r--r-- | django/core/serializers/json.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index ed65f2922c..64357bf9d5 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -8,6 +8,7 @@ from __future__ import absolute_import import datetime import decimal import json +import sys from django.core.serializers.base import DeserializationError from django.core.serializers.python import Serializer as PythonSerializer @@ -72,7 +73,7 @@ def Deserializer(stream_or_string, **options): raise except Exception as e: # Map to deserializer error - raise DeserializationError(e) + six.reraise(DeserializationError, DeserializationError(e), sys.exc_info()[2]) class DjangoJSONEncoder(json.JSONEncoder): |