Fixed #23812 -- Changed django.utils.six.moves.xrange imports to range

tests/backends/tests.py

@@ -26,7 +26,7 @@ from django.test import (TestCase, TransactionTestCase, mock, override_settings,
     skipUnlessDBFeature, skipIfDBFeature)
 from django.test.utils import str_prefix, IgnoreAllDeprecationWarningsMixin
 from django.utils import six
-from django.utils.six.moves import xrange
+from django.utils.six.moves import range
 
 from . import models
 
@@ -76,7 +76,7 @@ class OracleTests(unittest.TestCase):
         # than 4000 chars and read it properly
         with connection.cursor() as cursor:
             cursor.execute('CREATE TABLE ltext ("TEXT" NCLOB)')
-            long_str = ''.join(six.text_type(x) for x in xrange(4000))
+            long_str = ''.join(six.text_type(x) for x in range(4000))
             cursor.execute('INSERT INTO ltext VALUES (%s)', [long_str])
             cursor.execute('SELECT text FROM ltext')
             row = cursor.fetchone()

tests/delete/tests.py

@@ -5,7 +5,7 @@ from math import ceil
 from django.db import models, IntegrityError, connection
 from django.db.models.sql.constants import GET_ITERATOR_CHUNK_SIZE
 from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature
-from django.utils.six.moves import xrange
+from django.utils.six.moves import range
 
 from .models import (R, RChild, S, T, A, M, MR, MRNull,
     create_a, get_default_r, User, Avatar, HiddenUser, HiddenUserProfile,
@@ -169,7 +169,7 @@ class DeletionTests(TestCase):
 
     def test_bulk(self):
         s = S.objects.create(r=R.objects.create())
-        for i in xrange(2 * GET_ITERATOR_CHUNK_SIZE):
+        for i in range(2 * GET_ITERATOR_CHUNK_SIZE):
             T.objects.create(s=s)
         #   1 (select related `T` instances)
         # + 1 (select related `U` instances)
@@ -332,10 +332,10 @@ class DeletionTests(TestCase):
     def test_large_delete_related(self):
         TEST_SIZE = 2000
         s = S.objects.create(r=R.objects.create())
-        for i in xrange(TEST_SIZE):
+        for i in range(TEST_SIZE):
             T.objects.create(s=s)
 
-        batch_size = max(connection.ops.bulk_batch_size(['pk'], xrange(TEST_SIZE)), 1)
+        batch_size = max(connection.ops.bulk_batch_size(['pk'], range(TEST_SIZE)), 1)
 
         # TEST_SIZE // batch_size (select related `T` instances)
         # + 1 (select related `U` instances)

tests/middleware/tests.py

@@ -21,7 +21,7 @@ from django.test import TestCase, RequestFactory, override_settings
 from django.test.utils import patch_logger
 from django.utils import six
 from django.utils.encoding import force_str
-from django.utils.six.moves import xrange
+from django.utils.six.moves import range
 
 
 @override_settings(ROOT_URLCONF='middleware.urls')
@@ -602,7 +602,7 @@ class GZipMiddlewareTest(TestCase):
     """
     short_string = b"This string is too short to be worth compressing."
     compressible_string = b'a' * 500
-    uncompressible_string = b''.join(six.int2byte(random.randint(0, 255)) for _ in xrange(500))
+    uncompressible_string = b''.join(six.int2byte(random.randint(0, 255)) for _ in range(500))
     sequence = [b'a' * 500, b'b' * 200, b'a' * 300]
 
     def setUp(self):

tests/model_forms/models.py

@@ -18,6 +18,7 @@ from django.core.files.storage import FileSystemStorage
 from django.db import models
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
+from django.utils.six.moves import range
 from django.utils._os import upath
 
 
@@ -357,7 +358,7 @@ class Colour(models.Model):
     name = models.CharField(max_length=50)
 
     def __iter__(self):
-        for number in xrange(5):
+        for number in range(5):
             yield number
 
     def __str__(self):

tests/utils_tests/test_baseconv.py

@@ -1,13 +1,13 @@
 from unittest import TestCase
 
 from django.utils.baseconv import base2, base16, base36, base56, base62, base64, BaseConverter
-from django.utils.six.moves import xrange
+from django.utils.six.moves import range
 
 
 class TestBaseConv(TestCase):
 
     def test_baseconv(self):
-        nums = [-10 ** 10, 10 ** 10] + list(xrange(-100, 100))
+        nums = [-10 ** 10, 10 ** 10] + list(range(-100, 100))
         for converter in [base2, base16, base36, base56, base62, base64]:
             for i in nums:
                 self.assertEqual(i, converter.decode(converter.encode(i)))