Skip to content

Commit

Permalink
Fixed test failures introduced in e716518
Browse files Browse the repository at this point in the history
refs #20761
  • Loading branch information
timgraham committed Jul 23, 2013
1 parent fb052b5 commit ad98b98
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion django/db/models/query.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -420,12 +420,13 @@ def _create_object_from_params(self, lookup, params):
return obj, True return obj, True
except DatabaseError as e: except DatabaseError as e:
transaction.savepoint_rollback(sid, using=self.db) transaction.savepoint_rollback(sid, using=self.db)
exc_info = sys.exc_info()
if isinstance(e, IntegrityError): if isinstance(e, IntegrityError):
try: try:
return self.get(**lookup), False return self.get(**lookup), False
except self.model.DoesNotExist: except self.model.DoesNotExist:
pass pass
six.reraise(*sys.exc_info()) six.reraise(*exc_info)


def _extract_model_params(self, defaults, **kwargs): def _extract_model_params(self, defaults, **kwargs):
""" """
Expand Down

0 comments on commit ad98b98

Please sign in to comment.