cpython: 2f0c1937d716 (original) (raw)

Mercurial > cpython

changeset 94660:2f0c1937d716

Issue #22883: Got rid of outdated references to PyInt and PyString in comments. [#22883]

line wrap: on

line diff

--- a/Lib/test/test_getargs2.py +++ b/Lib/test/test_getargs2.py @@ -34,8 +34,8 @@ except ImportError:

> ** Changed from previous "range-and-a-half" to "none"; the

> range-and-a-half checking wasn't particularly useful.

# -# Plus a C API or two, e.g. PyInt_AsLongMask() -> -# unsigned long and PyInt_AsLongLongMask() -> unsigned +# Plus a C API or two, e.g. PyLong_AsUnsignedLongMask() -> +# unsigned long and PyLong_AsUnsignedLongLongMask() -> unsigned

long long (if that exists).

LARGE = 0x7FFFFFFF

--- a/Modules/_io/_iomodule.h +++ b/Modules/_io/_iomodule.h @@ -69,7 +69,7 @@ extern int _PyIO_trap_eintr(void);

• Offset type for positioning. */

-/* Printing a variable of type off_t (with e.g., PyString_FromFormat) +/* Printing a variable of type off_t (with e.g., PyUnicode_FromFormat) correctly and without producing compiler warnings is surprisingly painful. We identify an integer type whose size matches off_t and then: (1) cast the off_t to that integer type and (2) use the appropriate conversion

--- a/Modules/_json.c +++ b/Modules/_json.c @@ -827,7 +827,7 @@ bail: static PyObject * _parse_array_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {

• /* Read a JSON array from PyString pystr.

• /* Read a JSON array from PyUnicode pystr. idx is the index of the first character after the opening brace. *next_idx_ptr is a return-by-reference index to the first character after the closing brace.

@@ -899,8 +899,8 @@ bail: } static PyObject * -_parse_constant(PyScannerObject *s, char *constant, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {

• /* Read a JSON constant from PyString pystr.

+_parse_constant(PyScannerObject *s, const char *constant, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {

• /* Read a JSON constant. constant is the constant string that was found ("NaN", "Infinity", "-Infinity"). idx is the index of the first character of the constant @@ -932,7 +932,7 @@ static PyObject * the number.

Returns a new PyObject representation of that number:

•    PyInt, PyLong, or PyFloat.[](#l3.27)

•    PyLong, or PyFloat.[](#l3.28)
     May return other types if parse_int or parse_float are set[](#l3.29)

  */ void *str;

--- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -52,7 +52,7 @@ typedef struct * first get called with count=0? */ double timeout_started;

• /* None for autocommit, otherwise a PyString with the isolation level */

• /* None for autocommit, otherwise a PyUnicode with the isolation level / PyObject isolation_level; /* NULL for autocommit, otherwise a string with the BEGIN statement; will be

--- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -152,11 +152,8 @@ fcntl_ioctl_impl(PyModuleDef module, in /[clinic end generated code: output=ad47738c118622bf input=a55a6ee8e494c449]*/ { #define IOCTL_BUFSZ 1024

• /* We use the unsigned non-checked 'I'

•   format for the 'code' parameter because Python turns 0x8000000[](#l5.8)

•   into either a large positive number (PyLong or PyInt on 64-bit[](#l5.9)

•   platforms) or a negative number on others (32-bit PyInt)[](#l5.10)

•   whereas the system expects it to be a 32bit bit field value[](#l5.11)

• /* We use the unsigned non-checked 'I' format for the 'code' parameter

•   because the system expects it to be a 32bit bit field value[](#l5.13)
    regardless of it being passed as an int or unsigned long on[](#l5.14)
    various platforms.  See the termios.TIOCSWINSZ constant across[](#l5.15)
    platforms for an example of this.[](#l5.16)

--- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -3874,7 +3874,7 @@ typedef struct { fast_mode: when cnt an integer < PY_SSIZE_T_MAX and no step is specified.

• assert(cnt != PY_SSIZE_T_MAX && long_cnt == NULL && long_step==PyInt(1));

• assert(cnt != PY_SSIZE_T_MAX && long_cnt == NULL && long_step==PyLong(1)); Advances with: cnt += 1 When count hits Y_SSIZE_T_MAX, switch to slow_mode.

--- a/Python/ceval.c +++ b/Python/ceval.c @@ -4606,7 +4606,7 @@ ext_call_fail: return result; } -/* Extract a slice index from a PyInt or PyLong or an object with the +/* Extract a slice index from a PyLong or an object with the nb_index slot defined, and store in *pi. Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX, and silently boost values less than -PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1.