traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix deprecation warnings in test_set.py

This commit is contained in:
Ezio Melotti 2010-08-03 08:41:02 +00:00
parent ffd0b8892e
commit 5c75235d32
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/test/test_set.py
View File

@ -1385,8 +1385,9 @@ class TestCopying(unittest.TestCase):
def test_copy(self): def test_copy(self):
dup = self.set.copy() dup = self.set.copy()
dup_list = list(dup); dup_list.sort() with test_support.check_warnings():
set_list = list(self.set); set_list.sort() dup_list = sorted(dup)
set_list = sorted(self.set)
self.assertEqual(len(dup_list), len(set_list)) self.assertEqual(len(dup_list), len(set_list))
for i in range(len(dup_list)): for i in range(len(dup_list)):
self.failUnless(dup_list[i] is set_list[i]) self.failUnless(dup_list[i] is set_list[i])
@ -1394,8 +1395,9 @@ class TestCopying(unittest.TestCase):
def test_deep_copy(self): def test_deep_copy(self):
dup = copy.deepcopy(self.set) dup = copy.deepcopy(self.set)
##print type(dup), repr(dup) ##print type(dup), repr(dup)
dup_list = list(dup); dup_list.sort() with test_support.check_warnings():
set_list = list(self.set); set_list.sort() dup_list = sorted(dup)
set_list = sorted(self.set)
self.assertEqual(len(dup_list), len(set_list)) self.assertEqual(len(dup_list), len(set_list))
for i in range(len(dup_list)): for i in range(len(dup_list)):
self.assertEqual(dup_list[i], set_list[i]) self.assertEqual(dup_list[i], set_list[i])
@ -1557,8 +1559,9 @@ class TestVariousIteratorArgs(unittest.TestCase):
def test_constructor(self): def test_constructor(self):
for cons in (set, frozenset): 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), xrange(2000,2200,5)):
for g in (G, I, Ig, S, L, R): with test_support.check_warnings():
self.assertEqual(sorted(cons(g(s))), sorted(g(s))) for g in (G, I, Ig, S, L, R):
self.assertEqual(sorted(cons(g(s))), sorted(g(s)))
self.assertRaises(TypeError, cons , X(s)) self.assertRaises(TypeError, cons , X(s))
self.assertRaises(TypeError, cons , N(s)) self.assertRaises(TypeError, cons , N(s))
self.assertRaises(ZeroDivisionError, cons , E(s)) self.assertRaises(ZeroDivisionError, cons , E(s))
@ -1573,7 +1576,8 @@ class TestVariousIteratorArgs(unittest.TestCase):
if isinstance(expected, bool): if isinstance(expected, bool):
self.assertEqual(actual, expected) self.assertEqual(actual, expected)
else: else:
self.assertEqual(sorted(actual), sorted(expected)) with test_support.check_warnings():
self.assertEqual(sorted(actual), sorted(expected))
self.assertRaises(TypeError, meth, X(s)) self.assertRaises(TypeError, meth, X(s))
self.assertRaises(TypeError, meth, N(s)) self.assertRaises(TypeError, meth, N(s))
self.assertRaises(ZeroDivisionError, meth, E(s)) self.assertRaises(ZeroDivisionError, meth, E(s))
@ -1587,7 +1591,8 @@ class TestVariousIteratorArgs(unittest.TestCase):
t = s.copy() t = s.copy()
getattr(s, methname)(list(g(data))) getattr(s, methname)(list(g(data)))
getattr(t, methname)(g(data)) getattr(t, methname)(g(data))
self.assertEqual(sorted(s), sorted(t)) with test_support.check_warnings():
self.assertEqual(sorted(s), sorted(t))
self.assertRaises(TypeError, getattr(set('january'), methname), X(data)) self.assertRaises(TypeError, getattr(set('january'), methname), X(data))
self.assertRaises(TypeError, getattr(set('january'), methname), N(data)) self.assertRaises(TypeError, getattr(set('january'), methname), N(data))