mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merged revisions 79165 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines

  #7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
This commit is contained in:
Ezio Melotti 2010-08-02 19:56:05 +00:00
parent edabc7bca2
commit a65e2afe80
37 changed files with 306 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/test/test_sets.py
View file

@ -1,13 +1,11 @@
#!/usr/bin/env python
import warnings
warnings.filterwarnings("ignore", "the sets module is deprecated",
DeprecationWarning, "test\.test_sets")
import unittest, operator, copy, pickle, random
from sets import Set, ImmutableSet
from test import test_support
test_support.import_module("sets", deprecated=True)
from sets import Set, ImmutableSet
empty_set = Set()
#==============================================================================
@ -638,6 +636,10 @@ class TestOnlySetsOperator(TestOnlySetsInBinaryOps):
self.other = operator.add
self.otherIsIterable = False
def test_ge_gt_le_lt(self):
with test_support._check_py3k_warnings():
super(TestOnlySetsOperator, self).test_ge_gt_le_lt()
#------------------------------------------------------------------------------
class TestOnlySetsTuple(TestOnlySetsInBinaryOps):
@ -679,11 +681,12 @@ class TestCopying(unittest.TestCase):
def test_copy(self):
dup = self.set.copy()
dup_list = list(dup); dup_list.sort()
set_list = list(self.set); set_list.sort()
self.assertEqual(len(dup), len(self.set))
dup_list = sorted(dup)
set_list = sorted(self.set)
self.assertEqual(len(dup_list), len(set_list))
for i in range(len(dup_list)):
self.failUnless(dup_list[i] is set_list[i])
for i, el in enumerate(dup_list):
self.assertTrue(el is set_list[i])
def test_deep_copy(self):
dup = copy.deepcopy(self.set)
@ -694,6 +697,7 @@ class TestCopying(unittest.TestCase):
for i in range(len(dup_list)):
self.assertEqual(dup_list[i], set_list[i])
#------------------------------------------------------------------------------
class TestCopyingEmpty(TestCopying):
@ -712,6 +716,10 @@ class TestCopyingTriple(TestCopying):
def setUp(self):
self.set = Set(["zero", 0, None])
def test_copy(self):
with test_support._check_py3k_warnings():
super(TestCopyingTriple, self).test_copy()
#------------------------------------------------------------------------------
class TestCopyingTuple(TestCopying):