diff options
| -rw-r--r-- | Doc/c-api/number.rst | 6 | ||||
| -rw-r--r-- | Include/abstract.h | 6 | ||||
| -rw-r--r-- | Include/intobject.h | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/Doc/c-api/number.rst b/Doc/c-api/number.rst index e7c5f61..c8f6945 100644 --- a/Doc/c-api/number.rst +++ b/Doc/c-api/number.rst @@ -233,6 +233,12 @@ Number Protocol Returns the *o* converted to an integer object on success, or *NULL* on failure. This is the equivalent of the Python expression ``int(o)``. + .. note:: + + This function is defined in the transitional :file:`intobject.h` + header file. It will be removed completely in Python 3.1. Use + the :cfunc:`PyNumber_Long` function instead. + .. cfunction:: PyObject* PyNumber_Long(PyObject *o) diff --git a/Include/abstract.h b/Include/abstract.h index f4e31c7..dd00a53 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -784,7 +784,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ is cleared and the value is clipped. */ - #define PyNumber_Int PyNumber_Long + /* + PyNumber_Int used to be found here. It's now in Include/intobject.h, + where it is defined to be an alias for PyNumber_Long. New code + should use PyNumber_Long instead. + */ PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o); diff --git a/Include/intobject.h b/Include/intobject.h index 041c9f7..e3147f4 100644 --- a/Include/intobject.h +++ b/Include/intobject.h @@ -1,8 +1,8 @@ /* Integer object interface - This header files exists to make porting code to Python 3.0 easier. It - defines aliases from PyInt_* to PyLong_*. Only PyInt_GetMax() and - PyInt_CheckExact() remain in longobject.h. + This header file exists to make porting code to Python 3.0 easier. It + defines aliases from PyInt_* to PyLong_* and an alias from + PyNumber_Int to PyNumber_Long. */ #ifndef Py_INTOBJECT_H @@ -28,6 +28,7 @@ extern "C" { #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask #define PyInt_AS_LONG PyLong_AS_LONG +#define PyNumber_Int PyNumber_Long #ifdef __cplusplus } |