# HG changeset patch
# User Georg Brandl <georg@python.org>
# Date 1381761780 -7200
# Node ID 35b27e2415d6b8669f18d10caf17e1e68724f3a5
# Parent  cbf515f5a8101e3fcf2be99432282b88a7d7d90c
Closes #17765: make sure weakref.ref() is not passed keyword arguments as they are ignored.

diff -r cbf515f5a810 -r 35b27e2415d6 Lib/test/test_weakref.py
--- a/Lib/test/test_weakref.py	Mon Oct 14 16:08:25 2013 +0200
+++ b/Lib/test/test_weakref.py	Mon Oct 14 16:43:00 2013 +0200
@@ -122,6 +122,10 @@
         ref1 = weakref.ref(c, callback)
         del c
 
+    def test_constructor_kwargs(self):
+        c = C()
+        self.assertRaises(TypeError, weakref.ref, c, callback=None)
+
     def test_proxy_ref(self):
         o = C()
         o.bar = 1
diff -r cbf515f5a810 -r 35b27e2415d6 Objects/weakrefobject.c
--- a/Objects/weakrefobject.c	Mon Oct 14 16:08:25 2013 +0200
+++ b/Objects/weakrefobject.c	Mon Oct 14 16:43:00 2013 +0200
@@ -268,7 +268,6 @@
 parse_weakref_init_args(char *funcname, PyObject *args, PyObject *kwargs,
                         PyObject **obp, PyObject **callbackp)
 {
-    /* XXX Should check that kwargs == NULL or is empty. */
     return PyArg_UnpackTuple(args, funcname, 1, 2, obp, callbackp);
 }
 
@@ -331,6 +330,9 @@
 {
     PyObject *tmp;
 
+    if (PyWeakref_Check(self) && !_PyArg_NoKeywords("ref()", kwargs))
+        return -1;
+
     if (parse_weakref_init_args("__init__", args, kwargs, &tmp, &tmp))
         return 0;
     else