cpython: 901964295066 (original) (raw)
--- a/Lib/collections/init.py +++ b/Lib/collections/init.py @@ -939,7 +939,22 @@ class ChainMap(MutableMapping): class UserDict(MutableMapping): # Start by filling-out the abstract methods
- def init(*args, **kwargs):
if not args:[](#l1.9)raise TypeError("descriptor '__init__' of 'UserDict' object "[](#l1.10)"needs an argument")[](#l1.11)self, *args = args[](#l1.12)if len(args) > 1:[](#l1.13)raise TypeError('expected at most 1 arguments, got %d' % len(args))[](#l1.14)if args:[](#l1.15)dict = args[0][](#l1.16)elif 'dict' in kwargs:[](#l1.17)dict = kwargs.pop('dict')[](#l1.18)import warnings[](#l1.19)warnings.warn("Passing 'dict' as keyword argument is deprecated",[](#l1.20)DeprecationWarning, stacklevel=2)[](#l1.21)else:[](#l1.22)dict = None[](#l1.23) self.data = {}[](#l1.24) if dict is not None:[](#l1.25) self.update(dict)[](#l1.26)
--- a/Lib/test/test_userdict.py +++ b/Lib/test/test_userdict.py @@ -29,7 +29,8 @@ class UserDictTest(mapping_tests.TestHas self.assertEqual(collections.UserDict(one=1, two=2), d2) # item sequence constructor self.assertEqual(collections.UserDict([('one',1), ('two',2)]), d2)
self.assertEqual(collections.UserDict(dict=[('one',1), ('two',2)]), d2)[](#l2.7)
with self.assertWarnsRegex(DeprecationWarning, "'dict'"):[](#l2.8)self.assertEqual(collections.UserDict(dict=[('one',1), ('two',2)]), d2)[](#l2.9) # both together[](#l2.10) self.assertEqual(collections.UserDict([('one',1), ('two',2)], two=3, three=5), d3)[](#l2.11)
@@ -139,6 +140,30 @@ class UserDictTest(mapping_tests.TestHas self.assertEqual(t.popitem(), ("x", 42)) self.assertRaises(KeyError, t.popitem)
- def test_init(self):
for kw in 'self', 'other', 'iterable':[](#l2.18)self.assertEqual(list(collections.UserDict(**{kw: 42}).items()),[](#l2.19)[(kw, 42)])[](#l2.20)self.assertEqual(list(collections.UserDict({}, dict=42).items()),[](#l2.21)[('dict', 42)])[](#l2.22)self.assertEqual(list(collections.UserDict({}, dict=None).items()),[](#l2.23)[('dict', None)])[](#l2.24)with self.assertWarnsRegex(DeprecationWarning, "'dict'"):[](#l2.25)self.assertEqual(list(collections.UserDict(dict={'a': 42}).items()),[](#l2.26)[('a', 42)])[](#l2.27)self.assertRaises(TypeError, collections.UserDict, 42)[](#l2.28)self.assertRaises(TypeError, collections.UserDict, (), ())[](#l2.29)self.assertRaises(TypeError, collections.UserDict.__init__)[](#l2.30)
- def test_update(self):
for kw in 'self', 'dict', 'other', 'iterable':[](#l2.33)d = collections.UserDict()[](#l2.34)d.update(**{kw: 42})[](#l2.35)self.assertEqual(list(d.items()), [(kw, 42)])[](#l2.36)self.assertRaises(TypeError, collections.UserDict().update, 42)[](#l2.37)self.assertRaises(TypeError, collections.UserDict().update, {}, {})[](#l2.38)self.assertRaises(TypeError, collections.UserDict.update)[](#l2.39)
+ def test_missing(self): # Make sure UserDict doesn't have a missing method self.assertEqual(hasattr(collections.UserDict, "missing"), False)
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -190,6 +190,9 @@ Core and Builtins Library ------- +- Issue #22609: Constructor of collections.UserDict now accepts the self keyword