Browse Source

Merge 3.4

pull/9921/head
Andrew Svetlov 11 years ago
parent
commit
48050cbbe7
  1. 2
      Misc/NEWS
  2. 2
      Objects/methodobject.c

2
Misc/NEWS

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

2
Objects/methodobject.c

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

Loading…
Cancel
Save