mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-15 08:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[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_datastructures.py
View file

@ -50,7 +50,7 @@ class SortedDictTests(SimpleTestCase):
self.d2[7] = 'lucky number 7'
self.assertEqual(list(six.iterkeys(self.d2)), [1, 9, 0, 7])
if not six.PY3:
if six.PY2:
def test_change_keys(self):
"""
Changing the keys won't do anything, it's only a copy of the