Issue #18783: Removed existing mentions of Python long type in docstrings,

error messages and comments.

4 files changed, 5 insertions, 6 deletions

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 11d9ee4..3f270b4 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1529,7 +1529,7 @@ PyDoc_STRVAR(pow_doc,
 "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 71a0930..160c6fc 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1054,7 +1054,7 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
     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 9b5aff5..e68087f 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -1442,8 +1442,7 @@ _PyLong_FormatAdvancedWriter(_PyUnicodeWriter *writer,
     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 ec2d51f..727605a 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -148,7 +148,7 @@ w_pstring(const char *s, Py_ssize_t n, WFILE *p)
         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. */
 
@@ -505,7 +505,7 @@ w_complex_object(PyObject *v, char flag, WFILE *p)
     }
 }
 
-/* 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)
 {