MAINT: respond to review comments

ngoldbaum · ngoldbaum · commit dabfe59827e8 · 2024-07-09T12:44:34.000-06:00
diff --git a/numpy/_core/src/common/npy_argparse.h b/numpy/_core/src/common/npy_argparse.h
@@ -38,7 +38,7 @@ NPY_NO_EXPORT int init_argparse_mutex(void);
  * The sole purpose of this macro is to hide the argument parsing cache.
  * Since this cache must be static, this also removes a source of error.
  */
-#define NPY_PREPARE_ARGPARSER static _NpyArgParserCache __argparse_cache = {-1}
+#define NPY_PREPARE_ARGPARSER static _NpyArgParserCache __argparse_cache;
 
 /**
  * Macro to help with argument parsing.
diff --git a/numpy/_core/src/common/npy_import.h b/numpy/_core/src/common/npy_import.h
@@ -82,14 +82,16 @@ npy_import(const char *module, const char *attr)
 static inline int
 npy_cache_import_runtime(const char *module, const char *attr, PyObject **obj) {
     if (!npy_atomic_load_ptr(obj)) {
+        PyObject* value = npy_import(module, attr);
+        if (value == NULL) {
+            return -1;
+        }
         PyThread_acquire_lock(npy_runtime_imports.import_mutex, WAIT_LOCK);
         if (!npy_atomic_load_ptr(obj)) {
-            npy_atomic_store_ptr(obj, npy_import(module, attr));
-            if (obj == NULL) {
-                return -1;
-            }
+            npy_atomic_store_ptr(obj, Py_NewRef(value));
         }
         PyThread_release_lock(npy_runtime_imports.import_mutex);
+        Py_DECREF(value);
     }
     return 0;    
 }
