changeset:   98411:8274fc521e69
branch:      2.7
parent:      98407:4c5407e1b0ec
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Tue Sep 29 23:51:27 2015 +0300
files:       Lib/test/test_weakref.py Lib/weakref.py Misc/NEWS
description:
Issue #22958: Constructor and update method of weakref.WeakValueDictionary
now accept the self keyword argument.


diff -r 4c5407e1b0ec -r 8274fc521e69 Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py	Tue Sep 29 23:33:03 2015 +0300
+++ b/Lib/test/test_weakref.py	Tue Sep 29 23:51:27 2015 +0300
@@ -1197,6 +1197,18 @@
             dict[o] = o.arg
         return dict, objects
 
+    def test_make_weak_valued_dict_misc(self):
+        # errors
+        self.assertRaises(TypeError, weakref.WeakValueDictionary.__init__)
+        self.assertRaises(TypeError, weakref.WeakValueDictionary, {}, {})
+        self.assertRaises(TypeError, weakref.WeakValueDictionary, (), ())
+        # special keyword arguments
+        o = Object(3)
+        for kw in 'self', 'other', 'iterable':
+            d = weakref.WeakValueDictionary(**{kw: o})
+            self.assertEqual(list(d.keys()), [kw])
+            self.assertEqual(d[kw], o)
+
     def make_weak_valued_dict(self):
         dict = weakref.WeakValueDictionary()
         objects = map(Object, range(self.COUNT))
@@ -1279,6 +1291,19 @@
     def test_weak_valued_dict_update(self):
         self.check_update(weakref.WeakValueDictionary,
                           {1: C(), 'a': C(), C(): C()})
+        # errors
+        self.assertRaises(TypeError, weakref.WeakValueDictionary.update)
+        d = weakref.WeakValueDictionary()
+        self.assertRaises(TypeError, d.update, {}, {})
+        self.assertRaises(TypeError, d.update, (), ())
+        self.assertEqual(list(d.keys()), [])
+        # special keyword arguments
+        o = Object(3)
+        for kw in 'self', 'dict', 'other', 'iterable':
+            d = weakref.WeakValueDictionary()
+            d.update(**{kw: o})
+            self.assertEqual(list(d.keys()), [kw])
+            self.assertEqual(d[kw], o)
 
     def test_weak_keyed_dict_update(self):
         self.check_update(weakref.WeakKeyDictionary,
diff -r 4c5407e1b0ec -r 8274fc521e69 Lib/weakref.py
--- a/Lib/weakref.py	Tue Sep 29 23:33:03 2015 +0300
+++ b/Lib/weakref.py	Tue Sep 29 23:51:27 2015 +0300
@@ -44,7 +44,14 @@
     # objects are unwrapped on the way out, and we always wrap on the
     # way in).
 
-    def __init__(self, *args, **kw):
+    def __init__(*args, **kw):
+        if not args:
+            raise TypeError("descriptor '__init__' of 'WeakValueDictionary' "
+                            "object needs an argument")
+        self = args[0]
+        args = args[1:]
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
         def remove(wr, selfref=ref(self)):
             self = selfref()
             if self is not None:
@@ -214,7 +221,15 @@
         else:
             return wr()
 
-    def update(self, dict=None, **kwargs):
+    def update(*args, **kwargs):
+        if not args:
+            raise TypeError("descriptor 'update' of 'WeakValueDictionary' "
+                            "object needs an argument")
+        self = args[0]
+        args = args[1:]
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        dict = args[0] if args else None
         if self._pending_removals:
             self._commit_removals()
         d = self.data
diff -r 4c5407e1b0ec -r 8274fc521e69 Misc/NEWS
--- a/Misc/NEWS	Tue Sep 29 23:33:03 2015 +0300
+++ b/Misc/NEWS	Tue Sep 29 23:51:27 2015 +0300
@@ -37,6 +37,9 @@
 Library
 -------
 
+- Issue #22958: Constructor and update method of weakref.WeakValueDictionary
+  now accept the self keyword argument.
+
 - Issue #22609: Constructor and the update method of collections.UserDict now
   accept the self keyword argument.