mirror of
https://github.com/python/cpython.git
synced 2025-11-01 18:51:43 +00:00
Issue #9369: The types of char* arguments of PyObject_CallFunction() and
PyObject_CallMethod() now changed to `const char*`. Based on patches by Jörg Müller and Lars Buitinck.
This commit is contained in:
parent
8d90e383a3
commit
1cfebc73e0
6 changed files with 42 additions and 22 deletions
|
|
@ -240,7 +240,7 @@ is considered sufficient for this determination.
|
|||
of the Python expression ``callable_object(*args)``.
|
||||
|
||||
|
||||
.. c:function:: PyObject* PyObject_CallFunction(PyObject *callable, char *format, ...)
|
||||
.. c:function:: PyObject* PyObject_CallFunction(PyObject *callable, const char *format, ...)
|
||||
|
||||
Call a callable Python object *callable*, with a variable number of C arguments.
|
||||
The C arguments are described using a :c:func:`Py_BuildValue` style format
|
||||
|
|
@ -250,8 +250,11 @@ is considered sufficient for this determination.
|
|||
pass :c:type:`PyObject \*` args, :c:func:`PyObject_CallFunctionObjArgs` is a
|
||||
faster alternative.
|
||||
|
||||
.. versionchanged:: 3.4
|
||||
The type of *format* was changed from ``char *``.
|
||||
|
||||
.. c:function:: PyObject* PyObject_CallMethod(PyObject *o, char *method, char *format, ...)
|
||||
|
||||
.. c:function:: PyObject* PyObject_CallMethod(PyObject *o, const char *method, const char *format, ...)
|
||||
|
||||
Call the method named *method* of object *o* with a variable number of C
|
||||
arguments. The C arguments are described by a :c:func:`Py_BuildValue` format
|
||||
|
|
@ -261,6 +264,9 @@ is considered sufficient for this determination.
|
|||
Note that if you only pass :c:type:`PyObject \*` args,
|
||||
:c:func:`PyObject_CallMethodObjArgs` is a faster alternative.
|
||||
|
||||
.. versionchanged:: 3.4
|
||||
The types of *method* and *format* were changed from ``char *``.
|
||||
|
||||
|
||||
.. c:function:: PyObject* PyObject_CallFunctionObjArgs(PyObject *callable, ..., NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ PyDict_GetItem:PyObject*:key:0:
|
|||
|
||||
PyDict_GetItemString:PyObject*::0:
|
||||
PyDict_GetItemString:PyObject*:p:0:
|
||||
PyDict_GetItemString:char*:key::
|
||||
PyDict_GetItemString:const char*:key::
|
||||
|
||||
PyDict_SetDefault:PyObject*::0:
|
||||
PyDict_SetDefault:PyObject*:p:0:
|
||||
|
|
@ -917,7 +917,7 @@ PyObject_Call:PyObject*:kw:0:
|
|||
|
||||
PyObject_CallFunction:PyObject*::+1:
|
||||
PyObject_CallFunction:PyObject*:callable_object:0:
|
||||
PyObject_CallFunction:char*:format::
|
||||
PyObject_CallFunction:const char*:format::
|
||||
PyObject_CallFunction::...::
|
||||
|
||||
PyObject_CallFunctionObjArgs:PyObject*::+1:
|
||||
|
|
@ -926,8 +926,8 @@ PyObject_CallFunctionObjArgs::...::
|
|||
|
||||
PyObject_CallMethod:PyObject*::+1:
|
||||
PyObject_CallMethod:PyObject*:o:0:
|
||||
PyObject_CallMethod:char*:m::
|
||||
PyObject_CallMethod:char*:format::
|
||||
PyObject_CallMethod:const char*:m::
|
||||
PyObject_CallMethod:const char*:format::
|
||||
PyObject_CallMethod::...::
|
||||
|
||||
PyObject_CallMethodObjArgs:PyObject*::+1:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue