Issue #22609: Constructor and the update method of collections.UserDict now
accept the self keyword argument.
diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py
index d5cecd8..fa80fea 100644
--- a/Lib/test/test_userdict.py
+++ b/Lib/test/test_userdict.py
@@ -2,6 +2,7 @@
from test import test_support, mapping_tests
import UserDict
+import warnings
d0 = {}
d1 = {"one": 1}
@@ -29,7 +30,9 @@
self.assertEqual(UserDict.UserDict(one=1, two=2), d2)
# item sequence constructor
self.assertEqual(UserDict.UserDict([('one',1), ('two',2)]), d2)
- self.assertEqual(UserDict.UserDict(dict=[('one',1), ('two',2)]), d2)
+ with test_support.check_warnings((".*'dict'.*",
+ PendingDeprecationWarning)):
+ self.assertEqual(UserDict.UserDict(dict=[('one',1), ('two',2)]), d2)
# both together
self.assertEqual(UserDict.UserDict([('one',1), ('two',2)], two=3, three=5), d3)
@@ -148,6 +151,36 @@
self.assertEqual(t.popitem(), ("x", 42))
self.assertRaises(KeyError, t.popitem)
+ def test_init(self):
+ for kw in 'self', 'other', 'iterable':
+ self.assertEqual(list(UserDict.UserDict(**{kw: 42}).items()),
+ [(kw, 42)])
+ self.assertEqual(list(UserDict.UserDict({}, dict=42).items()),
+ [('dict', 42)])
+ self.assertEqual(list(UserDict.UserDict({}, dict=None).items()),
+ [('dict', None)])
+ with test_support.check_warnings((".*'dict'.*",
+ PendingDeprecationWarning)):
+ self.assertEqual(list(UserDict.UserDict(dict={'a': 42}).items()),
+ [('a', 42)])
+ self.assertRaises(TypeError, UserDict.UserDict, 42)
+ self.assertRaises(TypeError, UserDict.UserDict, (), ())
+ self.assertRaises(TypeError, UserDict.UserDict.__init__)
+
+ def test_update(self):
+ for kw in 'self', 'other', 'iterable':
+ d = UserDict.UserDict()
+ d.update(**{kw: 42})
+ self.assertEqual(list(d.items()), [(kw, 42)])
+ d = UserDict.UserDict()
+ with test_support.check_warnings((".*'dict'.*",
+ PendingDeprecationWarning)):
+ d.update(dict={'a': 42})
+ self.assertEqual(list(d.items()), [('a', 42)])
+ self.assertRaises(TypeError, UserDict.UserDict().update, 42)
+ self.assertRaises(TypeError, UserDict.UserDict().update, {}, {})
+ self.assertRaises(TypeError, UserDict.UserDict.update)
+
def test_missing(self):
# Make sure UserDict doesn't have a __missing__ method
self.assertEqual(hasattr(UserDict, "__missing__"), False)