commit dae2ef1cfad60b149370b4012aa48bea2dd27445
author Benjamin Peterson <benjamin@python.org> Sat May 09 00:29:08 2015 -0400
committer Benjamin Peterson <benjamin@python.org> Sat May 09 00:29:08 2015 -0400
tree 693595202f70ed00e60b57381cc4f76e6c7b9b61
parent 43e3d22fee9b22f6f9dec4364ea4ee796faefaab
parent 65bcdd7195666e20eb56a7d49b5dd0ee2278e506

merge 3.4

Modules/_functoolsmodule.c

diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index 3413b12..3c82e51 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -102,8 +102,17 @@
         }
     }
     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;