Update utils.h

mtsokol · Sep 9, 2023 · 2f08ba1 · 2f08ba1
1 parent 1f6a47f
commit 2f08ba1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 34 deletions.
diff --git a/numpy/_core/include/numpy/oldnumeric.h b/numpy/_core/include/numpy/oldnumeric.h
diff --git a/numpy/_core/include/numpy/utils.h b/numpy/_core/include/numpy/utils.h
@@ -39,7 +39,11 @@
 static PyObject *_npy_import_numpy_multiarray_umath()
 {
     PyObject *multiarray = PyImport_ImportModule("numpy._core._multiarray_umath");
-    if (multiarray == NULL) {
+    if (
+        multiarray == NULL && 
+        PyErr_ExceptionMatches(PyExc_ModuleNotFoundError)
+    ) {
+        PyErr_Clear();
         multiarray = PyImport_ImportModule("numpy.core._multiarray_umath");
     }
     return multiarray;

diff --git a/numpy/_core/src/common/npy_ctypes.h b/numpy/_core/src/common/npy_ctypes.h
@@ -4,7 +4,6 @@
 #include <Python.h>
 
 #include "npy_import.h"
-#include "numpy/utils.h"
 
 /*
  * Check if a python type is a ctypes class.