diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2015-11-25 12:54:52 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-12-03 16:31:50 -0500 |
| commit | 9f4e031bd3cb13d5879fe9ad3d889ce861b0babe (patch) | |
| tree | 79be55cfa7c8e9fe004e29b2e12c2fb60283e322 /django/utils/timezone.py | |
| parent | c6ea4ed5d23671deee6e736fe1daba2c650a4fbb (diff) | |
Fixed #25761 -- Added __cause__.__traceback__ to reraised exceptions.
When Django reraises an exception, it sets the __cause__ attribute even
in Python 2, mimicking Python's 3 behavior for "raise Foo from Bar".
However, Python 3 also ensures that all exceptions have a __traceback__
attribute and thus the "traceback2" Python 2 module (backport of Python
3's "traceback" module) relies on the fact that whenever you have a
__cause__ attribute, the recorded exception also has a __traceback__
attribute.
This is breaking testtools which is using traceback2 (see
https://github.com/testing-cabal/testtools/issues/162).
This commit fixes this inconsistency by ensuring that Django sets
the __traceback__ attribute on any exception stored in a __cause__
attribute of a reraised exception.
Diffstat (limited to 'django/utils/timezone.py')
| -rw-r--r-- | django/utils/timezone.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/utils/timezone.py b/django/utils/timezone.py index 70fd5e3e48..205cac44a9 100644 --- a/django/utils/timezone.py +++ b/django/utils/timezone.py @@ -146,6 +146,8 @@ class LocalTimezone(ReferenceLocalTimezone): exc_value = exc_type( "Unsupported value: %r. You should install pytz." % dt) exc_value.__cause__ = exc + if not hasattr(exc, '__traceback__'): + exc.__traceback__ = sys.exc_info()[2] six.reraise(exc_type, exc_value, sys.exc_info()[2]) utc = pytz.utc if pytz else UTC() |