merge 3.4

This commit is contained in:
Benjamin Peterson 2015-05-09 00:29:08 -04:00
commit dae2ef1cfa
3 changed files with 15 additions and 2 deletions

View file

@ -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;