Commit a9cab519 authored by Mark Dickinson's avatar Mark Dickinson

Issue #4910: PyNumber_Int is deprecated in 3.0.1; will be removed in 3.1.

parent b3ce9160
...@@ -233,6 +233,12 @@ Number Protocol ...@@ -233,6 +233,12 @@ Number Protocol
Returns the *o* converted to an integer object on success, or *NULL* on Returns the *o* converted to an integer object on success, or *NULL* on
failure. This is the equivalent of the Python expression ``int(o)``. 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) .. cfunction:: PyObject* PyNumber_Long(PyObject *o)
......
...@@ -784,7 +784,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ ...@@ -784,7 +784,11 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
is cleared and the value is clipped. 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); PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o);
......
/* Integer object interface /* Integer object interface
This header files exists to make porting code to Python 3.0 easier. It This header file exists to make porting code to Python 3.0 easier. It
defines aliases from PyInt_* to PyLong_*. Only PyInt_GetMax() and defines aliases from PyInt_* to PyLong_* and an alias from
PyInt_CheckExact() remain in longobject.h. PyNumber_Int to PyNumber_Long.
*/ */
#ifndef Py_INTOBJECT_H #ifndef Py_INTOBJECT_H
...@@ -28,6 +28,7 @@ extern "C" { ...@@ -28,6 +28,7 @@ extern "C" {
#define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
#define PyInt_AS_LONG PyLong_AS_LONG #define PyInt_AS_LONG PyLong_AS_LONG
#define PyNumber_Int PyNumber_Long
#ifdef __cplusplus #ifdef __cplusplus
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment