https://github.com/python/cpython/commit/b32d4cad15f537f25063bcd56377e16df59... commit: b32d4cad15f537f25063bcd56377e16df59d98db branch: main author: Victor Stinner <vstinner@python.org> committer: vstinner <vstinner@python.org> date: 2023-08-25T01:01:30+02:00 summary: gh-108444: Replace _PyLong_AsInt() with PyLong_AsInt() (#108459) Change generated by the command: sed -i -e 's!_PyLong_AsInt!PyLong_AsInt!g' \ $(find -name "*.c" -o -name "*.h") files: M Modules/_csv.c M Modules/_ctypes/stgdict.c M Modules/_datetimemodule.c M Modules/_io/fileio.c M Modules/_io/winconsoleio.c M Modules/_sqlite/connection.c M Modules/faulthandler.c M Modules/posixmodule.c M Modules/readline.c M Modules/socketmodule.c M Objects/bytesobject.c M Objects/fileobject.c M Objects/unicodeobject.c M Python/assemble.c M Python/ceval.c M Python/flowgraph.c M Python/initconfig.c M Python/legacy_tracing.c diff --git a/Modules/_csv.c b/Modules/_csv.c index 24a57e362521d..9568334b8069c 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -233,7 +233,7 @@ _set_int(const char *name, int *target, PyObject *src, int dflt) "\"%s\" must be an integer", name); return -1; } - value = _PyLong_AsInt(src); + value = PyLong_AsInt(src); if (value == -1 && PyErr_Occurred()) { return -1; } diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c index 54291a71667e3..9b0ca73a8b175 100644 --- a/Modules/_ctypes/stgdict.c +++ b/Modules/_ctypes/stgdict.c @@ -401,7 +401,7 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct return -1; } if (tmp) { - pack = _PyLong_AsInt(tmp); + pack = PyLong_AsInt(tmp); Py_DECREF(tmp); if (pack < 0) { if (!PyErr_Occurred() || diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 9002a1de7fb5b..454be6efc09d3 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -1923,7 +1923,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type) } num = PyTuple_GET_ITEM(tuple, 1); /* us */ - us = _PyLong_AsInt(num); + us = PyLong_AsInt(num); num = NULL; if (us == -1 && PyErr_Occurred()) { goto Done; @@ -1941,7 +1941,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type) Py_DECREF(num); num = PyTuple_GET_ITEM(tuple, 1); /* seconds */ - s = _PyLong_AsInt(num); + s = PyLong_AsInt(num); num = NULL; if (s == -1 && PyErr_Occurred()) { goto Done; @@ -1951,7 +1951,7 @@ microseconds_to_delta_ex(PyObject *pyus, PyTypeObject *type) } num = Py_NewRef(PyTuple_GET_ITEM(tuple, 0)); /* leftover days */ - d = _PyLong_AsInt(num); + d = PyLong_AsInt(num); if (d == -1 && PyErr_Occurred()) { goto Done; } diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 7fe37eee787e5..d52bcd50bd28c 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -264,7 +264,7 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode, self->fd = -1; } - fd = _PyLong_AsInt(nameobj); + fd = PyLong_AsInt(nameobj); if (fd < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_ValueError, @@ -412,7 +412,7 @@ _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode, goto error; } - self->fd = _PyLong_AsInt(fdobj); + self->fd = PyLong_AsInt(fdobj); Py_DECREF(fdobj); if (self->fd < 0) { if (!PyErr_Occurred()) { diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c index a1ed7eb61e47b..875c90c2ccd7b 100644 --- a/Modules/_io/winconsoleio.c +++ b/Modules/_io/winconsoleio.c @@ -280,7 +280,7 @@ _io__WindowsConsoleIO___init___impl(winconsoleio *self, PyObject *nameobj, self->fd = -1; } - fd = _PyLong_AsInt(nameobj); + fd = PyLong_AsInt(nameobj); if (fd < 0) { if (!PyErr_Occurred()) { PyErr_SetString(PyExc_ValueError, diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index e133977b28c37..a7780dedb5579 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -1396,7 +1396,7 @@ authorizer_callback(void *ctx, int action, const char *arg1, } else { if (PyLong_Check(ret)) { - rc = _PyLong_AsInt(ret); + rc = PyLong_AsInt(ret); if (rc == -1 && PyErr_Occurred()) { print_or_clear_traceback(ctx); rc = SQLITE_DENY; diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index 5ec34d4e99c80..aecb64dbb4464 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -116,7 +116,7 @@ faulthandler_get_fileno(PyObject **file_ptr) } } else if (PyLong_Check(file)) { - fd = _PyLong_AsInt(file); + fd = PyLong_AsInt(file); if (fd == -1 && PyErr_Occurred()) return -1; if (fd < 0) { diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 8026080912a7d..cffa401d2ceb0 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -6821,7 +6821,7 @@ parse_posix_spawn_flags(PyObject *module, const char *func_name, PyObject *setpg goto fail; } if (py_schedpolicy != Py_None) { - int schedpolicy = _PyLong_AsInt(py_schedpolicy); + int schedpolicy = PyLong_AsInt(py_schedpolicy); if (schedpolicy == -1 && PyErr_Occurred()) { goto fail; @@ -12484,7 +12484,7 @@ conv_confname(PyObject *arg, int *valuep, struct constdef *table, size_t tablesize) { if (PyLong_Check(arg)) { - int value = _PyLong_AsInt(arg); + int value = PyLong_AsInt(arg); if (value == -1 && PyErr_Occurred()) return 0; *valuep = value; @@ -15668,7 +15668,7 @@ os_waitstatus_to_exitcode_impl(PyObject *module, PyObject *status_obj) /*[clinic end generated code: output=db50b1b0ba3c7153 input=7fe2d7fdaea3db42]*/ { #ifndef MS_WINDOWS - int status = _PyLong_AsInt(status_obj); + int status = PyLong_AsInt(status_obj); if (status == -1 && PyErr_Occurred()) { return NULL; } diff --git a/Modules/readline.c b/Modules/readline.c index 6729a09cb0da5..2531b236b6ef1 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1001,7 +1001,7 @@ on_hook(PyObject *func) if (r == Py_None) result = 0; else { - result = _PyLong_AsInt(r); + result = PyLong_AsInt(r); if (result == -1 && PyErr_Occurred()) goto error; } diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index d1ac1ffec844a..b4094b8c49a37 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4879,17 +4879,17 @@ sock_sendmsg_afalg(PySocketSockObject *self, PyObject *args, PyObject *kwds) /* op is a required, keyword-only argument >= 0 */ if (opobj != NULL) { - op = _PyLong_AsInt(opobj); + op = PyLong_AsInt(opobj); } if (op < 0) { - /* override exception from _PyLong_AsInt() */ + /* override exception from PyLong_AsInt() */ PyErr_SetString(PyExc_TypeError, "Invalid or missing argument 'op'"); goto finally; } /* assoclen is optional but must be >= 0 */ if (assoclenobj != NULL) { - assoclen = _PyLong_AsInt(assoclenobj); + assoclen = PyLong_AsInt(assoclenobj); if (assoclen == -1 && PyErr_Occurred()) { goto finally; } @@ -5007,7 +5007,7 @@ sock_shutdown(PySocketSockObject *s, PyObject *arg) int how; int res; - how = _PyLong_AsInt(arg); + how = PyLong_AsInt(arg); if (how == -1 && PyErr_Occurred()) return NULL; Py_BEGIN_ALLOW_THREADS diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index a2c1f4cf359f9..c3a31bec822c3 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -753,7 +753,7 @@ _PyBytes_FormatEx(const char *format, Py_ssize_t format_len, "* wants int"); goto error; } - prec = _PyLong_AsInt(v); + prec = PyLong_AsInt(v); if (prec == -1 && PyErr_Occurred()) goto error; if (prec < 0) diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 751fb69d0891c..9c24025021883 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -174,7 +174,7 @@ PyObject_AsFileDescriptor(PyObject *o) PyObject *meth; if (PyLong_Check(o)) { - fd = _PyLong_AsInt(o); + fd = PyLong_AsInt(o); } else if (PyObject_GetOptionalAttr(o, &_Py_ID(fileno), &meth) < 0) { return -1; @@ -186,7 +186,7 @@ PyObject_AsFileDescriptor(PyObject *o) return -1; if (PyLong_Check(fno)) { - fd = _PyLong_AsInt(fno); + fd = PyLong_AsInt(fno); Py_DECREF(fno); } else { diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 6bbc2af258e67..2f6f41367d388 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14034,7 +14034,7 @@ unicode_format_arg_parse(struct unicode_formatter_t *ctx, "* wants int"); return -1; } - arg->prec = _PyLong_AsInt(v); + arg->prec = PyLong_AsInt(v); if (arg->prec == -1 && PyErr_Occurred()) return -1; if (arg->prec < 0) diff --git a/Python/assemble.c b/Python/assemble.c index c770fd108d41d..b6fb432aed4a3 100644 --- a/Python/assemble.c +++ b/Python/assemble.c @@ -476,7 +476,7 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, PyObject *k, *v; Py_ssize_t pos = 0; while (PyDict_Next(umd->u_varnames, &pos, &k, &v)) { - int offset = _PyLong_AsInt(v); + int offset = PyLong_AsInt(v); if (offset == -1 && PyErr_Occurred()) { return ERROR; } @@ -513,7 +513,7 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, continue; } - int offset = _PyLong_AsInt(v); + int offset = PyLong_AsInt(v); if (offset == -1 && PyErr_Occurred()) { return ERROR; } @@ -525,7 +525,7 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, pos = 0; while (PyDict_Next(umd->u_freevars, &pos, &k, &v)) { - int offset = _PyLong_AsInt(v); + int offset = PyLong_AsInt(v); if (offset == -1 && PyErr_Occurred()) { return ERROR; } diff --git a/Python/ceval.c b/Python/ceval.c index 55dfe6b1efc47..a56d31ea07363 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2416,7 +2416,7 @@ import_name(PyThreadState *tstate, _PyInterpreterFrame *frame, /* Fast path for not overloaded __import__. */ if (_PyImport_IsDefaultImportFunc(tstate->interp, import_func)) { - int ilevel = _PyLong_AsInt(level); + int ilevel = PyLong_AsInt(level); if (ilevel == -1 && _PyErr_Occurred(tstate)) { return NULL; } diff --git a/Python/flowgraph.c b/Python/flowgraph.c index e620e7cf1b9e9..55b871dd62736 100644 --- a/Python/flowgraph.c +++ b/Python/flowgraph.c @@ -2412,13 +2412,13 @@ build_cellfixedoffsets(_PyCompile_CodeUnitMetadata *umd) continue; } - int argoffset = _PyLong_AsInt(varindex); + int argoffset = PyLong_AsInt(varindex); Py_DECREF(varindex); if (argoffset == -1 && PyErr_Occurred()) { goto error; } - int oldindex = _PyLong_AsInt(cellindex); + int oldindex = PyLong_AsInt(cellindex); if (oldindex == -1 && PyErr_Occurred()) { goto error; } diff --git a/Python/initconfig.c b/Python/initconfig.c index 39d21adf54646..3281b3c6aea45 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -1097,7 +1097,7 @@ config_dict_get_int(PyObject *dict, const char *name, int *result) if (item == NULL) { return -1; } - int value = _PyLong_AsInt(item); + int value = PyLong_AsInt(item); Py_DECREF(item); if (value == -1 && PyErr_Occurred()) { if (PyErr_ExceptionMatches(PyExc_TypeError)) { diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c index 7774d10b10172..17a13b1361f99 100644 --- a/Python/legacy_tracing.c +++ b/Python/legacy_tracing.c @@ -256,7 +256,7 @@ sys_trace_line_func( Py_RETURN_NONE; } assert(PyVectorcall_NARGS(nargsf) == 2); - int line = _PyLong_AsInt(args[1]); + int line = PyLong_AsInt(args[1]); assert(line >= 0); PyFrameObject *frame = PyEval_GetFrame(); if (frame == NULL) { @@ -282,9 +282,9 @@ sys_trace_jump_func( Py_RETURN_NONE; } assert(PyVectorcall_NARGS(nargsf) == 3); - int from = _PyLong_AsInt(args[1])/sizeof(_Py_CODEUNIT); + int from = PyLong_AsInt(args[1])/sizeof(_Py_CODEUNIT); assert(from >= 0); - int to = _PyLong_AsInt(args[2])/sizeof(_Py_CODEUNIT); + int to = PyLong_AsInt(args[2])/sizeof(_Py_CODEUNIT); assert(to >= 0); if (to > from) { /* Forward jump */