enum.IntEnum -> enum.Enum

numpy · mattip · Nov 15, 2021 · Jun 5, 2021 · Jun 5, 2021 · Jun 7, 2021
commit 5481a8ac389962f855d15c91ba0fa365b3f06c90
diff --git a/numpy/__init__.pyi b/numpy/__init__.pyi
@@ -3642,7 +3642,7 @@ trunc: _UFunc_Nin1_Nout1[L['trunc'], L[7], None]
 
 abs = absolute
 
-class CopyMode(enum.IntEnum):
+class CopyMode(enum.Enum):
 
     ALWAYS: L[1]
     IF_NEEDED: L[0]

diff --git a/numpy/_globals.py b/numpy/_globals.py
@@ -93,7 +93,7 @@ def __repr__(self):
 
 _NoValue = _NoValueType()
 
-class CopyMode(enum.IntEnum):
+class CopyMode(enum.Enum):
 
     ALWAYS = 1
     IF_NEEDED = 0

diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c
@@ -174,15 +174,29 @@ PyArray_CopyConverter(PyObject *obj, PyNpCopyMode_Enum *copymode) {
     }
 
     int int_copymode = -1;
-    PyArray_PythonPyIntFromInt(obj, &int_copymode);
+    PyObject* numpy_CopyMode = NULL;
+    npy_cache_import("numpy._globals", "CopyMode", &numpy_CopyMode);
+    if( numpy_CopyMode != NULL ) {
+        if(PyObject_IsInstance(obj, numpy_CopyMode)) {
+            PyObject* mode_value = PyObject_GetAttrString(obj, "value");
+            PyArray_PythonPyIntFromInt(mode_value, &int_copymode);
+        }
+    }
-    if( numpy_CopyMode != NULL ) {
-        if(PyObject_IsInstance(obj, numpy_CopyMode)) {
-            PyObject* mode_value = PyObject_GetAttrString(obj, "value");
-            PyArray_PythonPyIntFromInt(mode_value, &int_copymode);
-        }
-    }
+    if (numpy_CopyMode == NULL) {
+        return NPY_FAIL;
+    }
+    if (PyObject_IsInstance(obj, numpy_CopyMode)) {
+        PyObject* mode_value = PyObject_GetAttrString(obj, "value");
+        if (mode_value == NULL) {
+            return NPY_FAIL;
+        }
+        if (!PyArray_PythonPyIntFromInt(mode_value, &int_copymode)) {
+            return NPY_FAIL;
+        }
+    }
-    if( numpy_CopyMode != NULL ) {
-        if(PyObject_IsInstance(obj, numpy_CopyMode)) {
-            PyObject* mode_value = PyObject_GetAttrString(obj, "value");
-            PyArray_PythonPyIntFromInt(mode_value, &int_copymode);
-        }
-    }
+    if (numpy_CopyMode == NULL) {
+        return NPY_FAIL;
+    }
+    if (PyObject_IsInstance(obj, numpy_CopyMode)) {
+        PyObject* mode_value = PyObject_GetAttrString(obj, "value");
+        if (mode_value == NULL) {
+            return NPY_FAIL;
+        }
+        if (!PyArray_PythonPyIntFromInt(mode_value, &int_copymode)) {
+            return NPY_FAIL;
+        }
+    }
+
+    // If obj is not an instance of numpy.CopyMode then follow
+    // the conventional assumption that it must be value that
+    // can be converted to an integer.
+    if( int_copymode < 0 ) {
+        PyArray_PythonPyIntFromInt(obj, &int_copymode);
+    }
 
     if( int_copymode != NPY_ALWAYS && 
         int_copymode != NPY_IF_NEEDED && 
         int_copymode != NPY_NEVER ) {
-        PyErr_Format(PyExc_ValueError,
-                        "Unrecognized copy mode %d. Please choose one of " 
-                         "np.CopyMode.ALWAYS, np.CopyMode.IF_NEEDED, np.CopyMode.NEVER.", 
-                         int_copymode);
+        PyErr_SetString(PyExc_ValueError,
+                    "Unrecognized copy mode. Please choose one of " 
+                    "np.CopyMode.ALWAYS, np.CopyMode.IF_NEEDED, np.CopyMode.NEVER, "
+                    "True/np.True_, False/np.False_");
         return NPY_FAIL;
     }