diff options
Diffstat (limited to 'Lib/test/test_set.py')
| -rw-r--r-- | Lib/test/test_set.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 0e47623..3b62478 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -227,7 +227,7 @@ class TestJointOps(unittest.TestCase): # Create a nest of cycles to exercise overall ref count check class A: pass - s = set(A() for i in xrange(1000)) + s = set(A() for i in range(1000)) for elem in s: elem.cycle = s elem.sub = elem @@ -283,7 +283,7 @@ class TestJointOps(unittest.TestCase): def test_do_not_rehash_dict_keys(self): n = 10 - d = dict.fromkeys(map(HashCountingInt, xrange(n))) + d = dict.fromkeys(map(HashCountingInt, range(n))) self.assertEqual(sum(elem.hash_count for elem in d), n) s = self.thetype(d) self.assertEqual(sum(elem.hash_count for elem in d), n) @@ -377,7 +377,7 @@ class TestSet(TestJointOps): s.discard(self.thetype(self.word)) def test_pop(self): - for i in xrange(len(self.s)): + for i in range(len(self.s)): elem = self.s.pop() self.assert_(elem not in self.s) self.assertRaises(KeyError, self.s.pop) @@ -525,7 +525,7 @@ class TestFrozenSet(TestJointOps): f = frozenset() efs = [frozenset(), frozenset([]), frozenset(()), frozenset(''), frozenset(), frozenset([]), frozenset(()), frozenset(''), - frozenset(xrange(0)), frozenset(frozenset()), + frozenset(range(0)), frozenset(frozenset()), frozenset(f), f] # All of the empty frozensets should have just one id() self.assertEqual(len(set(map(id, efs))), 1) @@ -541,9 +541,9 @@ class TestFrozenSet(TestJointOps): # make sure that all permutations give the same hash value n = 100 - seq = [randrange(n) for i in xrange(n)] + seq = [randrange(n) for i in range(n)] results = set() - for i in xrange(200): + for i in range(200): shuffle(seq) results.add(hash(self.thetype(seq))) self.assertEqual(len(results), 1) @@ -553,7 +553,7 @@ class TestFrozenSet(TestJointOps): self.assertEqual(id(self.s), id(dup)) def test_frozen_as_dictkey(self): - seq = range(10) + list('abcdefg') + ['apple'] + seq = list(range(10)) + list('abcdefg') + ['apple'] key1 = self.thetype(seq) key2 = self.thetype(reversed(seq)) self.assertEqual(key1, key2) @@ -571,7 +571,7 @@ class TestFrozenSet(TestJointOps): hashvalues = set() addhashvalue = hashvalues.add elemmasks = [(i+1, 1<<i) for i in range(n)] - for i in xrange(2**n): + for i in range(2**n): addhashvalue(hash(frozenset([e for e, m in elemmasks if m&i]))) self.assertEqual(len(hashvalues), 2**n) @@ -601,7 +601,7 @@ class TestFrozenSetSubclass(TestFrozenSet): F = Frozenset() efs = [Frozenset(), Frozenset([]), Frozenset(()), Frozenset(''), Frozenset(), Frozenset([]), Frozenset(()), Frozenset(''), - Frozenset(xrange(0)), Frozenset(Frozenset()), + Frozenset(range(0)), Frozenset(Frozenset()), Frozenset(frozenset()), f, F, Frozenset(f), Frozenset(F)] # All empty frozenset subclass instances should have different ids self.assertEqual(len(set(map(id, efs))), len(efs)) @@ -775,7 +775,7 @@ class TestExceptionPropagation(unittest.TestCase): set([1,2,3]) set((1,2,3)) set({'one':1, 'two':2, 'three':3}) - set(xrange(3)) + set(range(3)) set('abc') set(gooditer()) @@ -1268,7 +1268,7 @@ class TestOnlySetsString(TestOnlySetsInBinaryOps): class TestOnlySetsGenerator(TestOnlySetsInBinaryOps): def setUp(self): def gen(): - for i in xrange(0, 10, 2): + for i in range(0, 10, 2): yield i self.set = set((1, 2, 3)) self.other = gen() @@ -1451,7 +1451,7 @@ class TestVariousIteratorArgs(unittest.TestCase): def test_constructor(self): for cons in (set, frozenset): - for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)): + for s in ("123", "", range(1000), ('do', 1.2), range(2000,2200,5)): for g in (G, I, Ig, S, L, R): self.assertEqual(sorted(cons(g(s)), key=repr), sorted(g(s), key=repr)) self.assertRaises(TypeError, cons , X(s)) @@ -1460,7 +1460,7 @@ class TestVariousIteratorArgs(unittest.TestCase): def test_inline_methods(self): s = set('november') - for data in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5), 'december'): + for data in ("123", "", range(1000), ('do', 1.2), range(2000,2200,5), 'december'): for meth in (s.union, s.intersection, s.difference, s.symmetric_difference): for g in (G, I, Ig, L, R): expected = meth(data) @@ -1471,7 +1471,7 @@ class TestVariousIteratorArgs(unittest.TestCase): self.assertRaises(ZeroDivisionError, meth, E(s)) def test_inplace_methods(self): - for data in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5), 'december'): + for data in ("123", "", range(1000), ('do', 1.2), range(2000,2200,5), 'december'): for methname in ('update', 'intersection_update', 'difference_update', 'symmetric_difference_update'): for g in (G, I, Ig, S, L, R): @@ -1529,7 +1529,7 @@ def test_main(verbose=None): if verbose and hasattr(sys, "gettotalrefcount"): import gc counts = [None] * 5 - for i in xrange(len(counts)): + for i in range(len(counts)): test_support.run_unittest(*test_classes) gc.collect() counts[i] = sys.gettotalrefcount() |