1
0
mirror of https://github.com/django/django.git synced 2025-04-01 12:06:43 +00:00

Fixed test failures introduced in e716518ad29898fb25c820023aaf2fdd1c9eb4af

refs #20761
This commit is contained in:
Tim Graham 2013-07-23 15:20:53 -04:00
parent fb052b528a
commit ad98b985aa

View File

@ -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):
"""