mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 21:25:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Serhiy Storchaka 2015-02-17 10:14:30 +02:00
parent 77c041ba64
commit 483405bcca
7 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_getargs2.py
View file

@ -34,8 +34,8 @@ except ImportError:
# > ** Changed from previous "range-and-a-half" to "none"; the # > ** Changed from previous "range-and-a-half" to "none"; the
# > range-and-a-half checking wasn't particularly useful. # > range-and-a-half checking wasn't particularly useful.
# #
# Plus a C API or two, e.g. PyInt_AsLongMask() -> # Plus a C API or two, e.g. PyLong_AsUnsignedLongMask() ->
# unsigned long and PyInt_AsLongLongMask() -> unsigned # unsigned long and PyLong_AsUnsignedLongLongMask() -> unsigned
# long long (if that exists). # long long (if that exists).
LARGE = 0x7FFFFFFF LARGE = 0x7FFFFFFF

2
Modules/_io/_iomodule.h
View file

@ -69,7 +69,7 @@ extern int _PyIO_trap_eintr(void);
* Offset type for positioning. * 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. correctly and without producing compiler warnings is surprisingly painful.
We identify an integer type whose size matches off_t and then: (1) cast the 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 off_t to that integer type and (2) use the appropriate conversion

8
Modules/_json.c
View file

@ -827,7 +827,7 @@ bail:
static PyObject * static PyObject *
_parse_array_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) { _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. 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 *next_idx_ptr is a return-by-reference index to the first character after
the closing brace. the closing brace.
@ -899,8 +899,8 @@ bail:
} }
static PyObject * static PyObject *
_parse_constant(PyScannerObject *s, char *constant, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) { _parse_constant(PyScannerObject *s, const char *constant, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
/* Read a JSON constant from PyString pystr. /* Read a JSON constant.
constant is the constant string that was found constant is the constant string that was found
("NaN", "Infinity", "-Infinity"). ("NaN", "Infinity", "-Infinity").
idx is the index of the first character of the constant idx is the index of the first character of the constant
@ -932,7 +932,7 @@ _match_number_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_
the number. the number.
Returns a new PyObject representation of that number: Returns a new PyObject representation of that number:
PyInt, PyLong, or PyFloat. PyLong, or PyFloat.
May return other types if parse_int or parse_float are set May return other types if parse_int or parse_float are set
*/ */
void *str; void *str;

2
Modules/_sqlite/connection.h
View file

@ -52,7 +52,7 @@ typedef struct
* first get called with count=0? */ * first get called with count=0? */
double timeout_started; 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; PyObject* isolation_level;
/* NULL for autocommit, otherwise a string with the BEGIN statement; will be /* NULL for autocommit, otherwise a string with the BEGIN statement; will be

7
Modules/fcntlmodule.c
View file

@ -152,11 +152,8 @@ fcntl_ioctl_impl(PyModuleDef *module, int fd, unsigned int code, PyObject *ob_ar
/*[clinic end generated code: output=ad47738c118622bf input=a55a6ee8e494c449]*/ /*[clinic end generated code: output=ad47738c118622bf input=a55a6ee8e494c449]*/
{ {
#define IOCTL_BUFSZ 1024 #define IOCTL_BUFSZ 1024
/* We use the unsigned non-checked 'I' /* We use the unsigned non-checked 'I' format for the 'code' parameter
format for the 'code' parameter because Python turns 0x8000000 because the system expects it to be a 32bit bit field value
into either a large positive number (PyLong or PyInt on 64-bit
platforms) or a negative number on others (32-bit PyInt)
whereas the system expects it to be a 32bit bit field value
regardless of it being passed as an int or unsigned long on regardless of it being passed as an int or unsigned long on
various platforms. See the termios.TIOCSWINSZ constant across various platforms. See the termios.TIOCSWINSZ constant across
platforms for an example of this. platforms for an example of this.

2
Modules/itertoolsmodule.c
View file

@ -3874,7 +3874,7 @@ typedef struct {
fast_mode: when cnt an integer < PY_SSIZE_T_MAX and no step is specified. 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 Advances with: cnt += 1
When count hits Y_SSIZE_T_MAX, switch to slow_mode. When count hits Y_SSIZE_T_MAX, switch to slow_mode.

2
Python/ceval.c
View file

@ -4606,7 +4606,7 @@ ext_call_fail:
return result; 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. nb_index slot defined, and store in *pi.
Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX, 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. and silently boost values less than -PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1.