[py3] Fixed GeoDjango mutable list tests

lukegb · Sep 12, 2012 · fbd4b3a · fbd4b3a
1 parent c2c8d40
commit fbd4b3a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/django/contrib/gis/geos/tests/test_mutable_list.py b/django/contrib/gis/geos/tests/test_mutable_list.py
@@ -55,14 +55,14 @@ class ListMixinTest(unittest.TestCase):
 
     def lists_of_len(self, length=None):
         if length is None: length = self.limit
-        pl = range(length)
+        pl = list(range(length))
         return pl, self.listType(pl)
 
     def limits_plus(self, b):
         return range(-self.limit - b, self.limit + b)
 
     def step_range(self):
-        return range(-1 - self.limit, 0) + range(1, 1 + self.limit)
+        return list(range(-1 - self.limit, 0)) + list(range(1, 1 + self.limit))
 
     def test01_getslice(self):
         'Slice retrieval'
@@ -160,13 +160,13 @@ def test03_delslice(self):
                     del pl[i:j]
                     del ul[i:j]
                     self.assertEqual(pl[:], ul[:], 'del slice [%d:%d]' % (i,j))
-                    for k in range(-Len - 1,0) + range(1,Len):
+                    for k in list(range(-Len - 1, 0)) + list(range(1, Len)):
                         pl, ul = self.lists_of_len(Len)
                         del pl[i:j:k]
                         del ul[i:j:k]
                         self.assertEqual(pl[:], ul[:], 'del slice [%d:%d:%d]' % (i,j,k))
 
-                for k in range(-Len - 1,0) + range(1,Len):
+                for k in list(range(-Len - 1, 0)) + list(range(1, Len)):
                     pl, ul = self.lists_of_len(Len)
                     del pl[:i:k]
                     del ul[:i:k]
@@ -177,7 +177,7 @@ def test03_delslice(self):
                     del ul[i::k]
                     self.assertEqual(pl[:], ul[:], 'del slice [%d::%d]' % (i,k))
 
-            for k in range(-Len - 1,0) + range(1,Len):
+            for k in list(range(-Len - 1, 0)) + list(range(1, Len)):
                 pl, ul = self.lists_of_len(Len)
                 del pl[::k]
                 del ul[::k]
@@ -320,7 +320,7 @@ def test_11_sorting(self):
         pl.sort()
         ul.sort()
         self.assertEqual(pl[:], ul[:], 'sort')
-        mid = pl[len(pl) / 2]
+        mid = pl[len(pl) // 2]
         pl.sort(key=lambda x: (mid-x)**2)
         ul.sort(key=lambda x: (mid-x)**2)
         self.assertEqual(pl[:], ul[:], 'sort w/ key')
@@ -330,15 +330,15 @@ def test_11_sorting(self):
         pl.sort(reverse=True)
         ul.sort(reverse=True)
         self.assertEqual(pl[:], ul[:], 'sort w/ reverse')
-        mid = pl[len(pl) / 2]
+        mid = pl[len(pl) // 2]
         pl.sort(key=lambda x: (mid-x)**2)
         ul.sort(key=lambda x: (mid-x)**2)
         self.assertEqual(pl[:], ul[:], 'sort w/ key')
 
     def test_12_arithmetic(self):
         'Arithmetic'
         pl, ul = self.lists_of_len()
-        al = range(10,14)
+        al = list(range(10,14))
         self.assertEqual(list(pl + al), list(ul + al), 'add')
         self.assertEqual(type(ul), type(ul + al), 'type of add result')
         self.assertEqual(list(al + pl), list(al + ul), 'radd')