Issue #4910: replace "long" with "int" in docstring for __long__ slot and

in documentation for PyNumber_Long.

diff --git a/Doc/c-api/number.rst b/Doc/c-api/number.rst
index bb72119a9dcc20002942c1138aeb307534820b46..d11e3b180d24241187bbd51a3d77be48a8a60c37 100644 (file)
--- a/Doc/c-api/number.rst
+++ b/Doc/c-api/number.rst
@@ -230,19 +230,16 @@ Number Protocol
 
 .. cfunction:: PyObject* PyNumber_Int(PyObject *o)
 
-   .. index:: builtin: int
-
-   Returns the *o* converted to an integer object on success, or *NULL* on failure.
-   If the argument is outside the integer range a long object will be returned
-   instead. This is the equivalent of the Python expression ``int(o)``.
+   Returns the *o* converted to an integer object on success, or *NULL* on
+   failure.  This is the equivalent of the Python expression ``int(o)``.
 
 
 .. cfunction:: PyObject* PyNumber_Long(PyObject *o)
 
-   .. index:: builtin: long
+   .. index:: builtin: int
 
    Returns the *o* converted to an integer object on success, or *NULL* on
-   failure.  This is the equivalent of the Python expression ``long(o)``.
+   failure.  This is the equivalent of the Python expression ``int(o)``.
 
 
 .. cfunction:: PyObject* PyNumber_Float(PyObject *o)

diff --git a/Include/abstract.h b/Include/abstract.h
index 0bbcee54d963f6cff3770827037314eae9e46c9e..4fb16d049d4e3d037e2af1fbe666f11bee3454fe 100644 (file)
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -808,20 +808,14 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
 
      #define PyNumber_Int PyNumber_Long
 
+     PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
+
        /*
         Returns the o converted to an integer object on success, or
         NULL on failure.  This is the equivalent of the Python
         expression: int(o).
        */
 
-     PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
-
-       /*
-        Returns the o converted to a long integer object on success,
-        or NULL on failure.  This is the equivalent of the Python
-        expression: long(o).
-       */
-
      PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o);
 
        /*

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index b6ffe9237932c275cbacbfd4a8b519bde9fc28ca..8f2e01e00cff53d62b916c80e2a798b91c3e20bc 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5444,7 +5444,7 @@ static slotdef slotdefs[] = {
        UNSLOT("__int__", nb_int, slot_nb_int, wrap_unaryfunc,
               "int(x)"),
        UNSLOT("__long__", nb_long, slot_nb_long, wrap_unaryfunc,
-              "long(x)"),
+              "int(x)"),
        UNSLOT("__float__", nb_float, slot_nb_float, wrap_unaryfunc,
               "float(x)"),
        NBSLOT("__index__", nb_index, slot_nb_index, wrap_unaryfunc,