merge 3.4

benjaminp · benjaminp · commit dae2ef1cfad6 · 2015-05-09T00:29:08.000-04:00
diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
@@ -77,9 +77,11 @@ def test_kw_combinations(self):
         # exercise special code paths for no keyword args in
         # either the partial object or the caller
         p = self.partial(capture)
+        self.assertEqual(p.keywords, {})
         self.assertEqual(p(), ((), {}))
         self.assertEqual(p(a=1), ((), {'a':1}))
         p = self.partial(capture, a=1)
+        self.assertEqual(p.keywords, {'a':1})
         self.assertEqual(p(), ((), {'a':1}))
         self.assertEqual(p(b=2), ((), {'a':1, 'b':2}))
         # keyword args in the call override those in the partial object
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -167,6 +167,8 @@ Library
   lines from the code object, fixing an issue when a lambda function is used as
   decorator argument. Patch by Thomas Ballinger and Allison Kaptur.
 
+- The keywords attribute of functools.partial is now always a dictionary.
+
 - Issue #23811: Add missing newline to the PyCompileError error message.
   Patch by Alex Shkop.
 
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
@@ -102,8 +102,17 @@ partial_new(PyTypeObject *type, PyObject *args, PyObject *kw)
         }
     }
     else {
-        pto->kw = pkw;
-        Py_INCREF(pkw);
+        if (pkw == Py_None) {
+            pto->kw = PyDict_New();
+            if (pto->kw == NULL) {
+                Py_DECREF(pto);
+                return NULL;
+            }
+        }
+        else {
+            pto->kw = pkw;
+            Py_INCREF(pkw);
+        }
     }
 
     pto->weakreflist = NULL;

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,17 @@ partial_new(PyTypeObject type, PyObject args, PyObject *kw)`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`else {`
`105`		`- pto->kw = pkw;`
`106`		`- Py_INCREF(pkw);`
	`105`	`+ if (pkw == Py_None) {`
	`106`	`+ pto->kw = PyDict_New();`
	`107`	`+ if (pto->kw == NULL) {`
	`108`	`+ Py_DECREF(pto);`
	`109`	`+ return NULL;`
	`110`	`+ }`
	`111`	`+ }`
	`112`	`+ else {`
	`113`	`+ pto->kw = pkw;`
	`114`	`+ Py_INCREF(pkw);`
	`115`	`+ }`
`107`	`116`	`}`
`108`	`117`
`109`	`118`	`pto->weakreflist = NULL;`