mirror of
https://github.com/python/cpython.git
synced 2025-07-19 17:25:54 +00:00
gh-106084: Remove old PyObject call aliases (#106085)
Remove old aliases which were kept backwards compatibility with Python 3.8: * _PyObject_CallMethodNoArgs() * _PyObject_CallMethodOneArg() * _PyObject_CallOneArg() * _PyObject_FastCallDict() * _PyObject_Vectorcall() * _PyObject_VectorcallMethod() * _PyVectorcall_Function() Update code which used these aliases to use new names.
This commit is contained in:
parent
93a970ffbc
commit
00e75a3372
12 changed files with 42 additions and 24 deletions
|
@ -1485,7 +1485,7 @@ write_unraisable_exc_file(PyThreadState *tstate, PyObject *exc_type,
|
|||
}
|
||||
|
||||
/* Explicitly call file.flush() */
|
||||
PyObject *res = _PyObject_CallMethodNoArgs(file, &_Py_ID(flush));
|
||||
PyObject *res = PyObject_CallMethodNoArgs(file, &_Py_ID(flush));
|
||||
if (!res) {
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -278,7 +278,7 @@ import_ensure_initialized(PyInterpreterState *interp, PyObject *mod, PyObject *n
|
|||
Py_XDECREF(spec);
|
||||
if (busy) {
|
||||
/* Wait until module is done importing. */
|
||||
PyObject *value = _PyObject_CallMethodOneArg(
|
||||
PyObject *value = PyObject_CallMethodOneArg(
|
||||
IMPORTLIB(interp), &_Py_ID(_lock_unlock_module), name);
|
||||
if (value == NULL) {
|
||||
return -1;
|
||||
|
@ -1660,7 +1660,7 @@ PyImport_ExecCodeModuleWithPathnames(const char *name, PyObject *co,
|
|||
external= PyObject_GetAttrString(IMPORTLIB(interp),
|
||||
"_bootstrap_external");
|
||||
if (external != NULL) {
|
||||
pathobj = _PyObject_CallMethodOneArg(
|
||||
pathobj = PyObject_CallMethodOneArg(
|
||||
external, &_Py_ID(_get_sourcefile), cpathobj);
|
||||
Py_DECREF(external);
|
||||
}
|
||||
|
|
|
@ -1707,7 +1707,7 @@ marshal_dump_impl(PyObject *module, PyObject *value, PyObject *file,
|
|||
s = PyMarshal_WriteObjectToString(value, version);
|
||||
if (s == NULL)
|
||||
return NULL;
|
||||
res = _PyObject_CallMethodOneArg(file, &_Py_ID(write), s);
|
||||
res = PyObject_CallMethodOneArg(file, &_Py_ID(write), s);
|
||||
Py_DECREF(s);
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -1565,7 +1565,7 @@ _PyErr_Display(PyObject *file, PyObject *unused, PyObject *value, PyObject *tb)
|
|||
Py_XDECREF(ctx.seen);
|
||||
|
||||
/* Call file.flush() */
|
||||
PyObject *res = _PyObject_CallMethodNoArgs(file, &_Py_ID(flush));
|
||||
PyObject *res = PyObject_CallMethodNoArgs(file, &_Py_ID(flush));
|
||||
if (!res) {
|
||||
/* Silently ignore file.flush() error */
|
||||
PyErr_Clear();
|
||||
|
@ -1677,7 +1677,7 @@ flush_io_stream(PyThreadState *tstate, PyObject *name)
|
|||
{
|
||||
PyObject *f = _PySys_GetAttr(tstate, name);
|
||||
if (f != NULL) {
|
||||
PyObject *r = _PyObject_CallMethodNoArgs(f, &_Py_ID(flush));
|
||||
PyObject *r = PyObject_CallMethodNoArgs(f, &_Py_ID(flush));
|
||||
if (r) {
|
||||
Py_DECREF(r);
|
||||
}
|
||||
|
|
|
@ -3756,7 +3756,7 @@ sys_pyfile_write_unicode(PyObject *unicode, PyObject *file)
|
|||
if (file == NULL)
|
||||
return -1;
|
||||
assert(unicode != NULL);
|
||||
PyObject *result = _PyObject_CallMethodOneArg(file, &_Py_ID(write), unicode);
|
||||
PyObject *result = PyObject_CallMethodOneArg(file, &_Py_ID(write), unicode);
|
||||
if (result == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue