test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[py3] Fixed GeoDjango mutable list tests

This commit is contained in:
Claude Paroz 2012-09-12 16:13:58 +02:00
parent c2c8d4044e
commit fbd4b3a518
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/contrib/gis/geos/tests/test_mutable_list.py
View File

@ -55,14 +55,14 @@ class ListMixinTest(unittest.TestCase):
def lists_of_len(self, length=None): def lists_of_len(self, length=None):
if length is None: length = self.limit if length is None: length = self.limit
pl = range(length) pl = list(range(length))
return pl, self.listType(pl) return pl, self.listType(pl)
def limits_plus(self, b): def limits_plus(self, b):
return range(-self.limit - b, self.limit + b) return range(-self.limit - b, self.limit + b)
def step_range(self): 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): def test01_getslice(self):
'Slice retrieval' 'Slice retrieval'
@ -160,13 +160,13 @@ class ListMixinTest(unittest.TestCase):
del pl[i:j] del pl[i:j]
del ul[i:j] del ul[i:j]
self.assertEqual(pl[:], ul[:], 'del slice [%d:%d]' % (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) pl, ul = self.lists_of_len(Len)
del pl[i:j:k] del pl[i:j:k]
del ul[i:j:k] del ul[i:j:k]
self.assertEqual(pl[:], ul[:], 'del slice [%d:%d:%d]' % (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) pl, ul = self.lists_of_len(Len)
del pl[:i:k] del pl[:i:k]
del ul[:i:k] del ul[:i:k]
@ -177,7 +177,7 @@ class ListMixinTest(unittest.TestCase):
del ul[i::k] del ul[i::k]
self.assertEqual(pl[:], ul[:], 'del slice [%d::%d]' % (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) pl, ul = self.lists_of_len(Len)
del pl[::k] del pl[::k]
del ul[::k] del ul[::k]
@ -320,7 +320,7 @@ class ListMixinTest(unittest.TestCase):
pl.sort() pl.sort()
ul.sort() ul.sort()
self.assertEqual(pl[:], 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) pl.sort(key=lambda x: (mid-x)**2)
ul.sort(key=lambda x: (mid-x)**2) ul.sort(key=lambda x: (mid-x)**2)
self.assertEqual(pl[:], ul[:], 'sort w/ key') self.assertEqual(pl[:], ul[:], 'sort w/ key')
@ -330,7 +330,7 @@ class ListMixinTest(unittest.TestCase):
pl.sort(reverse=True) pl.sort(reverse=True)
ul.sort(reverse=True) ul.sort(reverse=True)
self.assertEqual(pl[:], ul[:], 'sort w/ reverse') 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) pl.sort(key=lambda x: (mid-x)**2)
ul.sort(key=lambda x: (mid-x)**2) ul.sort(key=lambda x: (mid-x)**2)
self.assertEqual(pl[:], ul[:], 'sort w/ key') self.assertEqual(pl[:], ul[:], 'sort w/ key')
@ -338,7 +338,7 @@ class ListMixinTest(unittest.TestCase):
def test_12_arithmetic(self): def test_12_arithmetic(self):
'Arithmetic' 'Arithmetic'
pl, ul = self.lists_of_len() 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(list(pl + al), list(ul + al), 'add')
self.assertEqual(type(ul), type(ul + al), 'type of add result') self.assertEqual(type(ul), type(ul + al), 'type of add result')
self.assertEqual(list(al + pl), list(al + ul), 'radd') self.assertEqual(list(al + pl), list(al + ul), 'radd')