MAINT: restore Npy__PyLong_AsInt

Author: mattip

numpy/_core/include/numpy/npy_3kcompat.h

@@ -20,14 +20,32 @@
 extern "C" {
 #endif
 
-/*
- * Macros to protect CRT calls against instant termination when passed an
- * invalid parameter (https://bugs.python.org/issue23524).
- */
+/* Python13 removes _PyLong_AsInt */
+static inline int
+Npy__PyLong_AsInt(PyObject *obj)
+{
+    int overflow;
+    long result = PyLong_AsLongAndOverflow(obj, &overflow);
+
+    /* INT_MAX and INT_MIN are defined in Python.h */
+    if (overflow || result > INT_MAX || result < INT_MIN) {
+        /* XXX: could be cute and give a different
+           message for overflow == -1 */
+        PyErr_SetString(PyExc_OverflowError,
+                        "Python int too large to convert to C int");
+        return -1;
+    }
+    return (int)result;
+}
+
 #if defined _MSC_VER && _MSC_VER >= 1900
 
 #include <stdlib.h>
 
+/*
+ * Macros to protect CRT calls against instant termination when passed an
+ * invalid parameter (https://bugs.python.org/issue23524).
+ */
 extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
 #define NPY_BEGIN_SUPPRESS_IPH { _invalid_parameter_handler _Py_old_handler = \
     _set_thread_local_invalid_parameter_handler(_Py_silent_invalid_parameter_handler);
@@ -40,7 +58,6 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
 
 #endif /* _MSC_VER >= 1900 */
 
-
 /*
  * PyFile_* compatibility
  */

numpy/f2py/cfuncs.py

@@ -878,13 +878,13 @@
     PyObject* tmp = NULL;
 
     if (PyLong_Check(obj)) {
-        *v = _PyLong_AsInt(obj);
+        *v = Npy__PyLong_AsInt(obj);
         return !(*v == -1 && PyErr_Occurred());
     }
 
     tmp = PyNumber_Long(obj);
     if (tmp) {
-        *v = _PyLong_AsInt(tmp);
+        *v = Npy__PyLong_AsInt(tmp);
         Py_DECREF(tmp);
         return !(*v == -1 && PyErr_Occurred());
     }