From 8689a10f075fa2a1980a4fda040c46ed4dbcb3bb Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 1 Apr 2010 16:53:15 +0000 Subject: Merged revisions 79555 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79555 | antoine.pitrou | 2010-04-01 18:42:11 +0200 (jeu., 01 avril 2010) | 5 lines Issue #8276: PyEval_CallObject() is now only available in macro form. The function declaration, which was kept for backwards compatibility reasons, is now removed (the macro was introduced in 1997!). ........ --- Include/ceval.h | 4 ---- Misc/NEWS | 4 ++++ Python/ceval.c | 13 +------------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Include/ceval.h b/Include/ceval.h index a48d23c..ad61373 100644 --- a/Include/ceval.h +++ b/Include/ceval.h @@ -10,10 +10,6 @@ extern "C" { PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( PyObject *, PyObject *, PyObject *); -/* DLL-level Backwards compatibility: */ -#undef PyEval_CallObject -PyAPI_FUNC(PyObject *) PyEval_CallObject(PyObject *, PyObject *); - /* Inline this */ #define PyEval_CallObject(func,arg) \ PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) diff --git a/Misc/NEWS b/Misc/NEWS index 6b645c8..3efed78 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -246,6 +246,10 @@ Core and Builtins C-API ----- +- Issue #8276: PyEval_CallObject() is now only available in macro form. The + function declaration, which was kept for backwards compatibility reasons, + is now removed (the macro was introduced in 1997!). + - Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to PyLong_AsLongAndOverflow. diff --git a/Python/ceval.c b/Python/ceval.c index 4e8557d..0c14eb0 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3695,18 +3695,7 @@ PyEval_MergeCompilerFlags(PyCompilerFlags *cf) /* External interface to call any callable object. - The arg must be a tuple or NULL. */ - -#undef PyEval_CallObject -/* for backward compatibility: export this interface */ - -PyObject * -PyEval_CallObject(PyObject *func, PyObject *arg) -{ - return PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL); -} -#define PyEval_CallObject(func,arg) \ - PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) + The arg must be a tuple or NULL. The kw must be a dict or NULL. */ PyObject * PyEval_CallObjectWithKeywords(PyObject *func, PyObject *arg, PyObject *kw) -- cgit v0.12