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

diff --git a/Include/ceval.h b/Include/ceval.h
index a48d23c143f5007dd66c01e6b175fb4ec4cbd3f9..ad61373c070b98f347d728677c933af4fec9668a 100644 (file)
--- 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 6b645c8889f48ac43e0d095a9c77b5c994d6c35d..3efed7842853ed36ab0bcbcbf293153a26565cea 100644 (file)
--- 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 4e8557df9a38366ccce2e55905c293da6627446c..0c14eb08e113148d2b1aa3061bc32aa911f90b61 100644 (file)
--- 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)