Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.5.x] [py3] Stopped iterating on exceptions. Refs #20025.

Backport of 86b4ac6 from master.
  • Loading branch information...
commit b5d6a5b21a2af4f0b4c3e8e3ca4b44e77812d996 1 parent 23b234a
@aaugustin aaugustin authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/db/backends/mysql/base.py
View
4 django/db/backends/mysql/base.py
@@ -123,7 +123,7 @@ def execute(self, query, args=None):
except Database.OperationalError as e:
# Map some error codes to IntegrityError, since they seem to be
# misclassified and Django would prefer the more logical place.
- if e[0] in self.codes_for_integrityerror:
+ if e.args[0] in self.codes_for_integrityerror:
six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
except Database.DatabaseError as e:
@@ -137,7 +137,7 @@ def executemany(self, query, args):
except Database.OperationalError as e:
# Map some error codes to IntegrityError, since they seem to be
# misclassified and Django would prefer the more logical place.
- if e[0] in self.codes_for_integrityerror:
+ if e.args[0] in self.codes_for_integrityerror:
six.reraise(utils.IntegrityError, utils.IntegrityError(*tuple(e.args)), sys.exc_info()[2])
six.reraise(utils.DatabaseError, utils.DatabaseError(*tuple(e.args)), sys.exc_info()[2])
except Database.DatabaseError as e:
Please sign in to comment.
Something went wrong with that request. Please try again.