Issue #22609: Constructor of collections.UserDict now accepts the self keyword

argument.

1 files changed, 16 insertions, 1 deletions

diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 943cbca4a7..638a4ca1eb 100644
--- 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__(self, dict=None, **kwargs):
+    def __init__(*args, **kwargs):
+        if not args:
+            raise TypeError("descriptor '__init__' of 'UserDict' object "
+                            "needs an argument")
+        self, *args = args
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        if args:
+            dict = args[0]
+        elif 'dict' in kwargs:
+            dict = kwargs.pop('dict')
+            import warnings
+            warnings.warn("Passing 'dict' as keyword argument is deprecated",
+                          DeprecationWarning, stacklevel=2)
+        else:
+            dict = None
         self.data = {}
         if dict is not None:
             self.update(dict)