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

2 files changed, 9 insertions, 4 deletions

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
 }