test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #23919 -- Used "raise from" instead of __cause__ in reraising backend-specific database exceptions. 

Thanks Tim Graham for the review.
This commit is contained in:
Mariusz Felisiak 2017-04-25 08:29:54 +02:00 committed by GitHub
parent 562bca67b9
commit 84dcd16247
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/utils.py
View File

@ -82,12 +82,11 @@ class DatabaseErrorWrapper:
db_exc_type = getattr(self.wrapper.Database, dj_exc_type.__name__) db_exc_type = getattr(self.wrapper.Database, dj_exc_type.__name__)
if issubclass(exc_type, db_exc_type): if issubclass(exc_type, db_exc_type):
dj_exc_value = dj_exc_type(*exc_value.args) dj_exc_value = dj_exc_type(*exc_value.args)
dj_exc_value.__cause__ = exc_value
# Only set the 'errors_occurred' flag for errors that may make # Only set the 'errors_occurred' flag for errors that may make
# the connection unusable. # the connection unusable.
if dj_exc_type not in (DataError, IntegrityError): if dj_exc_type not in (DataError, IntegrityError):
self.wrapper.errors_occurred = True self.wrapper.errors_occurred = True
raise dj_exc_value.with_traceback(traceback) raise dj_exc_value.with_traceback(traceback) from exc_value
def __call__(self, func): def __call__(self, func):
# Note that we are intentionally not using @wraps here for performance # Note that we are intentionally not using @wraps here for performance