1
0
mirror of https://github.com/django/django.git synced 2025-10-26 23:26:08 +00:00

[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.
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

View File

@@ -350,7 +350,7 @@ class ModelTest(TestCase):
"<Article: Third article>"])
# Slicing works with longs (Python 2 only -- Python 3 doesn't have longs).
if not six.PY3:
if six.PY2:
self.assertEqual(Article.objects.all()[long(0)], a)
self.assertQuerysetEqual(Article.objects.all()[long(1):long(3)],
["<Article: Second article>", "<Article: Third article>"])