summaryrefslogtreecommitdiff
path: root/tests/modeltests/basic/tests.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 12:45:19 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:53 +0200
commit56dbe924a6e700cefbfd34f1a5aa6c1ee01478dc (patch)
treedb6519ad2cb48518c61d9b0c74bcc7b2a5b453fa /tests/modeltests/basic/tests.py
parentf1d5dc81ac37fe9a7c7ca860900ee6a16150bb09 (diff)
[py3] Removed longs.
Diffstat (limited to 'tests/modeltests/basic/tests.py')
-rw-r--r--tests/modeltests/basic/tests.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/modeltests/basic/tests.py b/tests/modeltests/basic/tests.py
index 3f00fb25fe..d96c60bbe8 100644
--- a/tests/modeltests/basic/tests.py
+++ b/tests/modeltests/basic/tests.py
@@ -5,6 +5,7 @@ from datetime import datetime
from django.core.exceptions import ObjectDoesNotExist
from django.db.models.fields import Field, FieldDoesNotExist
from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
+from django.utils.six import PY3
from django.utils.translation import ugettext_lazy
from .models import Article
@@ -321,17 +322,18 @@ class ModelTest(TestCase):
["<Article: Area man programs in Python>",
"<Article: Third article>"])
- # Slicing works with longs.
- self.assertEqual(Article.objects.all()[0L], a)
- self.assertQuerysetEqual(Article.objects.all()[1L:3L],
- ["<Article: Second article>", "<Article: Third article>"])
- self.assertQuerysetEqual((s1 | s2 | s3)[::2L],
- ["<Article: Area man programs in Python>",
- "<Article: Third article>"])
+ # Slicing works with longs (Python 2 only -- Python 3 doesn't have longs).
+ if not PY3:
+ self.assertEqual(Article.objects.all()[long(0)], a)
+ self.assertQuerysetEqual(Article.objects.all()[long(1):long(3)],
+ ["<Article: Second article>", "<Article: Third article>"])
+ self.assertQuerysetEqual((s1 | s2 | s3)[::long(2)],
+ ["<Article: Area man programs in Python>",
+ "<Article: Third article>"])
- # And can be mixed with ints.
- self.assertQuerysetEqual(Article.objects.all()[1:3L],
- ["<Article: Second article>", "<Article: Third article>"])
+ # And can be mixed with ints.
+ self.assertQuerysetEqual(Article.objects.all()[1:long(3)],
+ ["<Article: Second article>", "<Article: Third article>"])
# Slices (without step) are lazy:
self.assertQuerysetEqual(Article.objects.all()[0:5].filter(),