summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-07-20 18:53:11 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-07-22 09:29:56 +0200
commita84d79f572fbe7512b999c6b3cd7667cbe3138ff (patch)
tree7d17f74640d7d0437c7cd87816b29bcd0cdb2ca7 /tests
parentca07fda2efea24cb43423b884fa4648d44e52963 (diff)
[py3] Added Python 3 compatibility for xrange.
Diffstat (limited to 'tests')
-rw-r--r--tests/modeltests/delete/tests.py1
-rw-r--r--tests/modeltests/many_to_one_null/tests.py4
-rw-r--r--tests/regressiontests/backends/tests.py5
-rw-r--r--tests/regressiontests/dispatch/tests/test_saferef.py4
-rw-r--r--tests/regressiontests/middleware/tests.py1
-rw-r--r--tests/regressiontests/utils/datastructures.py2
6 files changed, 10 insertions, 7 deletions
diff --git a/tests/modeltests/delete/tests.py b/tests/modeltests/delete/tests.py
index d681a76fd2..26f2fd52c1 100644
--- a/tests/modeltests/delete/tests.py
+++ b/tests/modeltests/delete/tests.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import
from django.db import models, IntegrityError
from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature
+from django.utils.six.moves import xrange
from .models import (R, RChild, S, T, U, A, M, MR, MRNull,
create_a, get_default_r, User, Avatar, HiddenUser, HiddenUserProfile)
diff --git a/tests/modeltests/many_to_one_null/tests.py b/tests/modeltests/many_to_one_null/tests.py
index 1a404bde02..4de44b5e64 100644
--- a/tests/modeltests/many_to_one_null/tests.py
+++ b/tests/modeltests/many_to_one_null/tests.py
@@ -88,8 +88,8 @@ class ManyToOneNullTests(TestCase):
def test_clear_efficiency(self):
r = Reporter.objects.create()
- for _ in xrange(3):
+ for _ in range(3):
r.article_set.create()
with self.assertNumQueries(1):
r.article_set.clear()
- self.assertEqual(r.article_set.count(), 0) \ No newline at end of file
+ self.assertEqual(r.article_set.count(), 0)
diff --git a/tests/regressiontests/backends/tests.py b/tests/regressiontests/backends/tests.py
index fa41aa7401..a6425c5591 100644
--- a/tests/regressiontests/backends/tests.py
+++ b/tests/regressiontests/backends/tests.py
@@ -17,6 +17,7 @@ from django.test import (TestCase, skipUnlessDBFeature, skipIfDBFeature,
TransactionTestCase)
from django.test.utils import override_settings
from django.utils import six
+from django.utils.six.moves import xrange
from django.utils import unittest
from . import models
@@ -531,7 +532,7 @@ class ThreadTests(TestCase):
from django.db import connection
connection.cursor()
connections_set.add(connection.connection)
- for x in xrange(2):
+ for x in range(2):
t = threading.Thread(target=runner)
t.start()
t.join()
@@ -558,7 +559,7 @@ class ThreadTests(TestCase):
# main thread.
conn.allow_thread_sharing = True
connections_set.add(conn)
- for x in xrange(2):
+ for x in range(2):
t = threading.Thread(target=runner)
t.start()
t.join()
diff --git a/tests/regressiontests/dispatch/tests/test_saferef.py b/tests/regressiontests/dispatch/tests/test_saferef.py
index 99251c5127..cfe6c5df85 100644
--- a/tests/regressiontests/dispatch/tests/test_saferef.py
+++ b/tests/regressiontests/dispatch/tests/test_saferef.py
@@ -1,7 +1,7 @@
from django.dispatch.saferef import safeRef
+from django.utils.six.moves import xrange
from django.utils import unittest
-
class Test1(object):
def x(self):
pass
@@ -70,4 +70,4 @@ class SaferefTests(unittest.TestCase):
def _closure(self, ref):
"""Dumb utility mechanism to increment deletion counter"""
- self.closureCount +=1 \ No newline at end of file
+ self.closureCount +=1
diff --git a/tests/regressiontests/middleware/tests.py b/tests/regressiontests/middleware/tests.py
index 47fca03ba3..ead34f46db 100644
--- a/tests/regressiontests/middleware/tests.py
+++ b/tests/regressiontests/middleware/tests.py
@@ -15,6 +15,7 @@ from django.middleware.http import ConditionalGetMiddleware
from django.middleware.gzip import GZipMiddleware
from django.test import TestCase, RequestFactory
from django.test.utils import override_settings
+from django.utils.six.moves import xrange
class CommonMiddlewareTest(TestCase):
def setUp(self):
diff --git a/tests/regressiontests/utils/datastructures.py b/tests/regressiontests/utils/datastructures.py
index 1af5018f3b..08bcd7157a 100644
--- a/tests/regressiontests/utils/datastructures.py
+++ b/tests/regressiontests/utils/datastructures.py
@@ -98,7 +98,7 @@ class SortedDictTests(SimpleTestCase):
self.assertEqual(l - len(self.d1), 1)
def test_dict_equality(self):
- d = SortedDict((i, i) for i in xrange(3))
+ d = SortedDict((i, i) for i in range(3))
self.assertEqual(d, {0: 0, 1: 1, 2: 2})
def test_tuple_init(self):