The Vulnerability History Project

[1.6.x] Replaced "not PY3" by "PY2", new in six 1.4.0.

      Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/base.py

Backport of 365c3e8b from master.

by Shawn the Jaguar 2013-09-02 10:06:32 UTC

commit 115318051c092f6ca8240262bd8b17b9e56ab838

Django

django/contrib/auth/management/__init__.py

+1 -1

django/contrib/auth/tests/test_basic.py

+2 -2

django/core/mail/message.py

+1 -1

django/db/backends/mysql/base.py

+1 -1

django/db/backends/oracle/base.py

+5 -5

django/db/backends/sqlite3/base.py

+1 -1

django/db/models/base.py

+1 -1

django/http/cookie.py

+1 -1

django/template/loaders/app_directories.py

+2 -2

django/template/loaders/eggs.py

+1 -1

django/utils/_os.py

+3 -3

django/utils/encoding.py

+1 -1

django/utils/feedgenerator.py

+2 -2

django/utils/functional.py

+1 -1

django/utils/http.py

+2 -2

django/utils/text.py

+1 -1

docs/topics/python3.txt

+6 -4

tests/base/models.py

+1 -1

tests/basic/tests.py

+1 -1

tests/defaultfilters/tests.py

+1 -1

tests/httpwrappers/tests.py

+7 -7

tests/i18n/tests.py

+1 -1

tests/signing/tests.py

+2 -2

tests/test_utils/doctest_output.py

+1 -1

tests/utils_tests/test_datastructures.py

+1 -1

tests/utils_tests/test_http.py

+2 -2

tests/utils_tests/test_simplelazyobject.py

+1 -1