diff -r 2bad07298c5c Include/longobject.h --- a/Include/longobject.h Wed Nov 05 11:30:21 2014 -0500 +++ b/Include/longobject.h Wed Dec 10 16:52:57 2014 +0530 @@ -31,8 +31,7 @@ #endif PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); -/* It may be useful in the future. I've added it in the PyInt -> PyLong - cleanup to keep the extra information. [CH] */ +/* It may be useful in the future. [CH] */ #define PyLong_AS_LONG(op) PyLong_AsLong(op) /* Issue #1983: pid_t can be longer than a C long on some systems */ diff -r 2bad07298c5c Modules/_json.c --- a/Modules/_json.c Wed Nov 05 11:30:21 2014 -0500 +++ b/Modules/_json.c Wed Dec 10 16:52:57 2014 +0530 @@ -810,7 +810,7 @@ the 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 */ void *str; diff -r 2bad07298c5c Modules/fcntlmodule.c --- a/Modules/fcntlmodule.c Wed Nov 05 11:30:21 2014 -0500 +++ b/Modules/fcntlmodule.c Wed Dec 10 16:52:57 2014 +0530 @@ -100,9 +100,8 @@ int fd; /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I' format for the 'code' parameter because Python turns 0x8000000 - 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 + into either a large positive number (PyLong on 64-bit + platforms) whereas the system expects it to be a 32bit bit field value regardless of it being passed as an int or unsigned long on various platforms. See the termios.TIOCSWINSZ constant across platforms for an example of this. diff -r 2bad07298c5c Modules/itertoolsmodule.c --- a/Modules/itertoolsmodule.c Wed Nov 05 11:30:21 2014 -0500 +++ b/Modules/itertoolsmodule.c Wed Dec 10 16:52:57 2014 +0530 @@ -3866,7 +3866,7 @@ 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); Advances with: cnt += 1 When count hits Y_SSIZE_T_MAX, switch to slow_mode. diff -r 2bad07298c5c Python/ceval.c --- a/Python/ceval.c Wed Nov 05 11:30:21 2014 -0500 +++ b/Python/ceval.c Wed Dec 10 16:52:57 2014 +0530 @@ -4565,7 +4565,7 @@ 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.