Merge 3.4

This commit is contained in:
Andrew Svetlov 2015-04-27 17:49:16 +03:00
commit 48050cbbe7
2 changed files with 3 additions and 1 deletions

View File

@ -89,6 +89,8 @@ Core and Builtins
- Issue #24044: Fix possible null pointer dereference in list.sort in out of
memory conditions.
- Issue #21354: PyCFunction_New function is exposed by python DLL again.
Library
-------

View File

@ -16,7 +16,7 @@ static int numfree = 0;
/* undefine macro trampoline to PyCFunction_NewEx */
#undef PyCFunction_New
PyObject *
PyAPI_FUNC(PyObject *)
PyCFunction_New(PyMethodDef *ml, PyObject *self)
{
return PyCFunction_NewEx(ml, self, NULL);