mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge 3.4

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

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

2
Objects/methodobject.c
View file

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