[Python-checkins] r79555 - in python/trunk: Include/ceval.h Misc/NEWS Python/ceval.c

antoine.pitrou python-checkins at python.org
Thu Apr 1 18:42:11 CEST 2010


Author: antoine.pitrou
Date: Thu Apr  1 18:42:11 2010
New Revision: 79555

Log:
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!).



Modified:
   python/trunk/Include/ceval.h
   python/trunk/Misc/NEWS
   python/trunk/Python/ceval.c

Modified: python/trunk/Include/ceval.h
==============================================================================
--- python/trunk/Include/ceval.h	(original)
+++ python/trunk/Include/ceval.h	Thu Apr  1 18:42:11 2010
@@ -10,10 +10,6 @@
 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)

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Apr  1 18:42:11 2010
@@ -169,6 +169,10 @@
 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 #7992: A replacement PyCObject API, PyCapsule, has been backported
   from Python 3.1.
 

Modified: python/trunk/Python/ceval.c
==============================================================================
--- python/trunk/Python/ceval.c	(original)
+++ python/trunk/Python/ceval.c	Thu Apr  1 18:42:11 2010
@@ -3852,18 +3852,7 @@
 
 
 /* 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)


More information about the Python-checkins mailing list