mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-18 17:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

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

Backport of 365c3e8b from master.
This commit is contained in:
Aymeric Augustin 2013-09-02 12:06:32 +02:00
parent 50012577f3
commit 115318051c
27 changed files with 48 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/utils_tests/test_simplelazyobject.py
View file

@ -178,7 +178,7 @@ class TestUtilsSimpleLazyObject(TestCase):
pickled = pickle.dumps(x, 1)
pickled = pickle.dumps(x, 2)
if not six.PY3:
if six.PY2:
import cPickle
# This would fail with "TypeError: expected string or Unicode object, NoneType found".