[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4

Mon Apr 27 16:49:26 CEST 2015

https://hg.python.org/cpython/rev/4803a6d569f7
changeset: 95820:4803a6d569f7
parent: 95818:18882c93f4bd
parent: 95819:69951573cb0e
user: Andrew Svetlov <andrew.svetlov at gmail.com>
date: Mon Apr 27 17:49:16 2015 +0300
summary:
 Merge 3.4
files:
 Misc/NEWS | 2 ++
 Objects/methodobject.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,8 @@
 - 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
 -------
 
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -16,7 +16,7 @@
 /* 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);
-- 
Repository URL: https://hg.python.org/cpython
