changeset:   89461:c9861ec8754c
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Sun Mar 02 12:25:27 2014 -0500
files:       Lib/test/test_inspect.py Misc/NEWS Objects/typeobject.c
description:
Issue #20786: Fix signatures for dict.__delitem__ and property.__delete__


diff -r d3732760e3d6 -r c9861ec8754c Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py	Sun Mar 02 04:17:01 2014 -0500
+++ b/Lib/test/test_inspect.py	Sun Mar 02 12:25:27 2014 -0500
@@ -1764,6 +1764,11 @@
                 __call__ = type
             test_callable(ThisWorksNow())
 
+        # Regression test for issue #20786
+        test_unbound_method(dict.__delitem__)
+        test_unbound_method(property.__delete__)
+
+
     @cpython_only
     @unittest.skipIf(MISSING_C_DOCSTRINGS,
                      "Signature information for builtins requires docstrings")
diff -r d3732760e3d6 -r c9861ec8754c Misc/NEWS
--- a/Misc/NEWS	Sun Mar 02 04:17:01 2014 -0500
+++ b/Misc/NEWS	Sun Mar 02 12:25:27 2014 -0500
@@ -14,6 +14,9 @@
 - Issue #20637: Key-sharing now also works for instance dictionaries of
   subclasses.  Patch by Peter Ingebretson.
 
+- Issue #20786: Fix signatures for dict.__delitem__ and
+  property.__delete__ builtins.
+
 Library
 -------
 
diff -r d3732760e3d6 -r c9861ec8754c Objects/typeobject.c
--- a/Objects/typeobject.c	Sun Mar 02 04:17:01 2014 -0500
+++ b/Objects/typeobject.c	Sun Mar 02 12:25:27 2014 -0500
@@ -6192,7 +6192,7 @@
            "__set__($self, instance, value, /)\n--\n\nSet an attribute of instance to value."),
     TPSLOT("__delete__", tp_descr_set, slot_tp_descr_set,
            wrap_descr_delete,
-           "__delete__(instance, /)\n--\n\nDelete an attribute of instance."),
+           "__delete__($self, instance, /)\n--\n\nDelete an attribute of instance."),
     FLSLOT("__init__", tp_init, slot_tp_init, (wrapperfunc)wrap_init,
            "__init__($self, /, *args, **kwargs)\n--\n\n"
            "Initialize self.  See help(type(self)) for accurate signature.",
@@ -6289,7 +6289,7 @@
            "__setitem__($self, key, value, /)\n--\n\nSet self[key] to value."),
     MPSLOT("__delitem__", mp_ass_subscript, slot_mp_ass_subscript,
            wrap_delitem,
-           "__delitem__(key)\n--\n\nDelete self[key]."),
+           "__delitem__($self, key, /)\n--\n\nDelete self[key]."),
 
     SQSLOT("__len__", sq_length, slot_sq_length, wrap_lenfunc,
            "__len__($self, /)\n--\n\nReturn len(self)."),