Migrate remaining tests from UserDict.UserDict to collections.UserDict.

diff --git a/Lib/test/mapping_tests.py b/Lib/test/mapping_tests.py
index d595cc5ec4e9add6bbf11c0d6dfe5bea5638168c..b8bbc9a2291e7d01f45a9a223865f3585b4fc898 100644 (file)
--- a/Lib/test/mapping_tests.py
+++ b/Lib/test/mapping_tests.py
@@ -1,6 +1,6 @@
 # tests common to dict and UserDict
 import unittest
-import UserDict
+import collections
 
 
 class BasicTestMappingProtocol(unittest.TestCase):
@@ -438,11 +438,11 @@ class TestMappingProtocol(BasicTestMappingProtocol):
         # self.assert_(type(dictlike.fromkeys('a')) is dictlike)
         class mydict(self.type2test):
             def __new__(cls):
-                return UserDict.UserDict()
+                return collections.UserDict()
         ud = mydict.fromkeys('ab')
         self.assertEqual(ud, {'a':None, 'b':None})
         # FIXME: the following won't work with UserDict, because it's an old style class
-        # self.assert_(isinstance(ud, UserDict.UserDict))
+        # self.assert_(isinstance(ud, collections.UserDict))
         self.assertRaises(TypeError, dict.fromkeys)
 
         class Exc(Exception): pass
@@ -574,10 +574,10 @@ class TestHashMappingProtocol(TestMappingProtocol):
         TestMappingProtocol.test_fromkeys(self)
         class mydict(self.type2test):
             def __new__(cls):
-                return UserDict.UserDict()
+                return collections.UserDict()
         ud = mydict.fromkeys('ab')
         self.assertEqual(ud, {'a':None, 'b':None})
-        self.assert_(isinstance(ud, UserDict.UserDict))
+        self.assert_(isinstance(ud, collections.UserDict))
 
     def test_pop(self):
         TestMappingProtocol.test_pop(self)

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 1b9edc0ecadb17532ab08be1bf961d8106d76aa2..b17133a1cebbf9286188d40103b95b7f1df74d3b 100644 (file)
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -5,7 +5,7 @@ from test.test_support import fcmp, TESTFN, unlink,  run_unittest, \
                               run_with_locale
 from operator import neg
 
-import sys, warnings, random, UserDict, io, rational
+import sys, warnings, random, collections, io, rational
 warnings.filterwarnings("ignore", "hex../oct.. of negative int",
                         FutureWarning, __name__)
 warnings.filterwarnings("ignore", "integer argument expected",
@@ -400,7 +400,7 @@ class BuiltinTest(unittest.TestCase):
 
         # Verify locals stores (used by list comps)
         eval('[locals() for i in (2,3)]', g, d)
-        eval('[locals() for i in (2,3)]', g, UserDict.UserDict())
+        eval('[locals() for i in (2,3)]', g, collections.UserDict())
 
         class SpreadSheet:
             "Sample application showing nested, calculated lookups."

diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py
index 88227350a3e6840fdf251da735415548521ee6fb..3ef82be0b7280d211afe4a9cd584e8f0c5504483 100644 (file)
--- a/Lib/test/test_cfgparser.py
+++ b/Lib/test/test_cfgparser.py
@@ -1,11 +1,11 @@
 import ConfigParser
 import io
 import unittest
-import UserDict
+import collections
 
 from test import test_support
 
-class SortedDict(UserDict.UserDict):
+class SortedDict(collections.UserDict):
     def items(self):
         return sorted(self.data.items())
 

diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
index 6a0b3c1053627144cdb7ec38ff55727bfe24f4fc..1997dc53b3d8a2db4bed9454ffc9314f3e99dd7c 100644 (file)
--- a/Lib/test/test_dict.py
+++ b/Lib/test/test_dict.py
@@ -1,7 +1,7 @@
 import unittest
 from test import test_support
 
-import sys, UserDict, random, string
+import sys, collections, random, string
 
 
 class DictTest(unittest.TestCase):
@@ -209,10 +209,10 @@ class DictTest(unittest.TestCase):
         self.assert_(type(dictlike().fromkeys('a')) is dictlike)
         class mydict(dict):
             def __new__(cls):
-                return UserDict.UserDict()
+                return collections.UserDict()
         ud = mydict.fromkeys('ab')
         self.assertEqual(ud, {'a':None, 'b':None})
-        self.assert_(isinstance(ud, UserDict.UserDict))
+        self.assert_(isinstance(ud, collections.UserDict))
         self.assertRaises(TypeError, dict.fromkeys)
 
         class Exc(Exception): pass

diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py
index 611f4ab1e258ebaff2968bbed99a8beebc3ee0e2..2dc87b9d059c75bbec1f25d3933bb139b1b66ce4 100644 (file)
--- a/Lib/test/test_extcall.py
+++ b/Lib/test/test_extcall.py
@@ -1,6 +1,6 @@
 from test.test_support import verify, verbose, TestFailed, sortdict
 from UserList import UserList
-from UserDict import UserDict
+from collections import UserDict
 
 def e(a, b):
     print(a, b)

diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py
index f2ab4f4f2a71a5e19420c4024be95a589b1d2d74..7385f96385ceb24c86e06714828635c205e23a4f 100644 (file)
--- a/Lib/test/test_funcattrs.py
+++ b/Lib/test/test_funcattrs.py
@@ -175,7 +175,7 @@ class ArbitraryFunctionAttrTest(FuncAttrsTest):
 class FunctionDictsTest(FuncAttrsTest):
     def test_setting_dict_to_invalid(self):
         self.cannot_set_attr(self.b, '__dict__', None, TypeError)
-        from UserDict import UserDict
+        from collections import UserDict
         d = UserDict({'known_attr': 7})
         self.cannot_set_attr(self.fi.a.__func__, '__dict__', d, TypeError)