Issue #18783: Removed existing mentions of Python long type in docstrings,
error messages and comments.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index b07ee8e..dffdf46 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1512,7 +1512,7 @@
"pow(x, y[, z]) -> number\n\
\n\
With two arguments, equivalent to x**y. With three arguments,\n\
-equivalent to (x**y) % z, but may be more efficient (e.g. for longs).");
+equivalent to (x**y) % z, but may be more efficient (e.g. for ints).");
diff --git a/Python/compile.c b/Python/compile.c
index dd4262c..6d66255 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1013,7 +1013,7 @@
Py_ssize_t arg;
double d;
- /* necessary to make sure types aren't coerced (e.g., int and long) */
+ /* necessary to make sure types aren't coerced (e.g., float and complex) */
/* _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms */
if (PyFloat_Check(o)) {
d = PyFloat_AS_DOUBLE(o);
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index 2fe446a..a6516dc 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -1439,8 +1439,7 @@
case 'x':
case 'X':
case 'n':
- /* no type conversion needed, already an int (or long). do
- the formatting */
+ /* no type conversion needed, already an int. do the formatting */
result = format_long_internal(obj, &format, writer);
break;
diff --git a/Python/marshal.c b/Python/marshal.c
index a0e527f..cc17329 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -146,7 +146,7 @@
w_string(s, n, p);
}
-/* We assume that Python longs are stored internally in base some power of
+/* We assume that Python ints are stored internally in base some power of
2**15; for the sake of portability we'll always read and write them in base
exactly 2**15. */
@@ -432,7 +432,7 @@
p->depth--;
}
-/* version currently has no effect for writing longs. */
+/* version currently has no effect for writing ints. */
void
PyMarshal_WriteLongToFile(long x, FILE *fp, int version)
{