[Python-checkins] cpython (2.7): Issue #22340: Fix test_collections if the sets module was already imported

Fri Sep 5 21:41:37 CEST 2014

http://hg.python.org/cpython/rev/407653078135
changeset: 92352:407653078135
branch: 2.7
user: Victor Stinner <victor.stinner at gmail.com>
date: Fri Sep 05 21:41:25 2014 +0200
summary:
 Issue #22340: Fix test_collections if the sets module was already imported
files:
 Lib/test/test_collections.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -14,8 +14,8 @@
 from collections import Set, MutableSet
 from collections import Mapping, MutableMapping
 from collections import Sequence, MutableSequence
-with test_support.check_warnings(('', DeprecationWarning)):
- import sets
+# Silence deprecation warning
+sets = test_support.import_module('sets', deprecated=True)
 
 TestNT = namedtuple('TestNT', 'x y z') # type used for pickle tests
 
-- 
Repository URL: http://hg.python.org/cpython
