Commit b5d6a5b2 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

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

Backport of 86b4ac66 from master.
parent 23b234a9

django/db/backends/mysql/base.py

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ class CursorWrapper(object): 
        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 @@ class CursorWrapper(object): 
        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: