cleanup

eendebakpt · eendebakpt · commit df428386ae43 · 2025-05-05T23:21:40.000+02:00
diff --git a/numpy/_core/src/multiarray/convert.c b/numpy/_core/src/multiarray/convert.c
@@ -22,7 +22,6 @@
 #include "array_assign.h"
 
 #include "convert.h"
-#include "getset.h"
 #include "array_coercion.h"
 #include "refcount.h"
 
diff --git a/numpy/_core/src/multiarray/getset.c b/numpy/_core/src/multiarray/getset.c
@@ -376,8 +376,23 @@ array_nbytes_get(PyArrayObject *self, void *NPY_UNUSED(ignored))
  * will be adjusted in that case as well.
  */
 static int
-array_descr_set_lock_held(PyArrayObject *self, PyObject *arg)
+array_descr_set(PyArrayObject *self, PyObject *arg)
 {
+    // to be replaced with PyUnstable_Object_IsUniquelyReferenced https://github.com/python/cpython/pull/133144
+    int unique_reference = (Py_REFCNT(self) == 1);
+
+    if (!unique_reference) {
+        // this will not emit deprecation warnings for all cases, but for most it will
+        /* DEPRECATED 2025-05-04, NumPy 2.3 */
+        int ret = PyErr_WarnEx(PyExc_DeprecationWarning,
+                    "Setting the dtype on a Numpy array has been deprecated in Numpy 2.3.\n"
+                    "Instead of changing the dtype on an array x, create a new array with x.view(new_dtype)",
+                    1);
+        if (ret) {
+            return -1;
+        }
+    }
+
     PyArray_Descr *newtype = NULL;
 
     if (arg == NULL) {
@@ -522,28 +537,6 @@ array_descr_set_lock_held(PyArrayObject *self, PyObject *arg)
     return -1;
 }
 
-static int
-array_descr_set(PyArrayObject *self, PyObject *arg, void *NPY_UNUSED(ignored))
-{
-    // to be replaced with PyUnstable_Object_IsUniquelyReferenced https://github.com/python/cpython/pull/133144
-    int unique_reference = (Py_REFCNT(self) == 1);
-
-    if (!unique_reference) {
-        // this will not emit deprecation warnings for all cases we want, but it gets is in the right direction
-        /* DEPRECATED 2025-05-04, NumPy 2.3 */
-        int ret = PyErr_WarnEx(PyExc_DeprecationWarning,
-                    "Setting the dtype on a Numpy array has been deprecated in Numpy 2.3.\n"
-                    "Instead of changing the dtype on an array x, create a new array with x.view(new_dtype)",
-                    1);
-        //printf("array_descr_set: %p %p: %ld, bail\n", self, arg, Py_REFCNT(self));
-        if (ret) {
-            return -1;
-        }
-    }
-    //printf("array_descr_set: %p %p: %ld\n", self, arg, Py_REFCNT(self));
-    return array_descr_set_lock_held(self, arg);
-}
-
 static PyObject *
 array_struct_get(PyArrayObject *self, void *NPY_UNUSED(ignored))
 {
