docs/conf.py | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 disable creation of _sources directory by sphinx

 We do this to save some space as the sources of the documentation
 are not really useful in a binary package.
 .
 This is a Debian specific patch.

django/contrib/gis/geoip/base.py | 19 10 + 9 - 0 !
1 file changed, 10 insertions(+), 9 deletions(-)

 use debian geoip database path as default

 Default to Debian standard path for GeoIP directory and for GeoIP city
 file. Avoids the need to declare them in each project.
 .
 This is a Debian specific patch.
Bug-Debian: http://bugs.debian.org/645094

django/db/migrations/loader.py | 2 2 + 0 - 0 !
django/db/utils.py | 2 2 + 0 - 0 !
django/utils/timezone.py | 2 2 + 0 - 0 !
docs/ref/exceptions.txt | 4 3 + 1 - 0 !
4 files changed, 9 insertions(+), 1 deletion(-)

 fix #25761 -- re-raised exceptions need __cause__.__traceback__

When Django re-raises an exception, it sets the __cause__ attribute even
in Python 2, thus mimicking Python's 3 behaviour 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 at least 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 re-raised exception.

Patch-Name: fix-25761-add-traceback-attribute.patch