summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-23 15:20:53 -0400
committerTim Graham <timograham@gmail.com>2013-07-23 15:21:29 -0400
commitad98b985aa18fbca65b45aae2421b985904bf561 (patch)
tree7f212caac0d6d60756d7fbdf9913181a3e26838c
parentfb052b528ad5f0a92f7420ab8ade16462b6435fd (diff)
Fixed test failures introduced in e716518ad29898fb25c820023aaf2fdd1c9eb4af
refs #20761
-rw-r--r--django/db/models/query.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 9e0dd9202c..087c10de8e 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -420,12 +420,13 @@ class QuerySet(object):
return obj, True
except DatabaseError as e:
transaction.savepoint_rollback(sid, using=self.db)
+ exc_info = sys.exc_info()
if isinstance(e, IntegrityError):
try:
return self.get(**lookup), False
except self.model.DoesNotExist:
pass
- six.reraise(*sys.exc_info())
+ six.reraise(*exc_info)
def _extract_model_params(self, defaults, **kwargs):
"""