bpo-40792: Make the result of PyNumber_Index() always having exact type int. (GH-20443)

Previously, the result could have been an instance of a subclass of int.

Also revert bpo-26202 and make attributes start, stop and step of the range
object having exact type int.

Add private function _PyNumber_Index() which preserves the old behavior
of PyNumber_Index() for performance to use it in the conversion functions
like PyLong_AsLong().
This commit is contained in:
Serhiy Storchaka 2020-05-28 10:33:45 +03:00 committed by GitHub
parent eaca2aa117
commit 5f4b229df7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 187 additions and 187 deletions

View file

@ -45,7 +45,7 @@ warnings_warn(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec
if (args[2]) {
{
Py_ssize_t ival = -1;
PyObject *iobj = PyNumber_Index(args[2]);
PyObject *iobj = _PyNumber_Index(args[2]);
if (iobj != NULL) {
ival = PyLong_AsSsize_t(iobj);
Py_DECREF(iobj);
@ -66,4 +66,4 @@ skip_optional_pos:
exit:
return return_value;
}
/*[clinic end generated code: output=484e5ffe94edf0f0 input=a9049054013a1b77]*/
/*[clinic end generated code: output=eb9997fa998fdbad input=a9049054013a1b77]*/

View file

@ -784,7 +784,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
PyObject *iobj;
Py_ssize_t *p = va_arg(*p_va, Py_ssize_t *);
Py_ssize_t ival = -1;
iobj = PyNumber_Index(arg);
iobj = _PyNumber_Index(arg);
if (iobj != NULL) {
ival = PyLong_AsSsize_t(iobj);
Py_DECREF(iobj);