MAINT: Address review comments

numpy · ngoldbaum · Oct 24, 2023 · Jun 9, 2023 · Jun 9, 2023 · Jun 9, 2023
commit ba47e60841d7b3e0d08090a99650166ff66d6f3e
diff --git a/numpy/_core/src/multiarray/multiarraymodule.c b/numpy/_core/src/multiarray/multiarraymodule.c
@@ -3254,6 +3254,7 @@ PyArray_Where(PyObject *condition, PyObject *x, PyObject *y)
 {
     PyArrayObject *arr, *ax, *ay = NULL;
     PyObject *ret = NULL;
+    PyArray_Descr *common_dt = NULL;
 
     arr = (PyArrayObject *)PyArray_FROM_O(condition);
     if (arr == NULL) {
@@ -3295,23 +3296,20 @@ PyArray_Where(PyObject *condition, PyObject *x, PyObject *y)
         NPY_ITER_READONLY | NPY_ITER_ALIGNED,
         NPY_ITER_READONLY | NPY_ITER_ALIGNED
     };
-    PyArray_Descr * common_dt = PyArray_ResultType(2, &op_in[2],
-                                                    0, NULL);
+    common_dt = PyArray_ResultType(2, &op_in[2], 0, NULL);
     PyArray_Descr * op_dt[4] = {common_dt, PyArray_DescrFromType(NPY_BOOL),
                                 common_dt, common_dt};
     NpyIter * iter;
     NPY_BEGIN_THREADS_DEF;
 
     if (common_dt == NULL || op_dt[1] == NULL) {
         Py_XDECREF(op_dt[1]);
-        Py_XDECREF(common_dt);
         goto fail;
     }
-    iter =  NpyIter_MultiNew(4, op_in, flags,
-                                NPY_KEEPORDER, NPY_UNSAFE_CASTING,
-                                op_flags, op_dt);
+    iter =  NpyIter_MultiNew(
+            4, op_in, flags, NPY_KEEPORDER, NPY_UNSAFE_CASTING,
+            op_flags, op_dt);
     Py_DECREF(op_dt[1]);
-    Py_DECREF(common_dt);
     if (iter == NULL) {
         goto fail;
     }
@@ -3420,6 +3418,7 @@ PyArray_Where(PyObject *condition, PyObject *x, PyObject *y)
     Py_DECREF(arr);
     Py_DECREF(ax);
     Py_DECREF(ay);
+    Py_DECREF(common_dt);
     NPY_cast_info_xfree(&cast_info);
 
     if (NpyIter_Deallocate(iter) != NPY_SUCCEED) {
@@ -3433,6 +3432,7 @@ PyArray_Where(PyObject *condition, PyObject *x, PyObject *y)
     Py_DECREF(arr);
     Py_XDECREF(ax);
     Py_XDECREF(ay);
+    Py_XDECREF(common_dt);
     NPY_cast_info_xfree(&cast_info);
     return NULL;
 }

diff --git a/numpy/_core/tests/test_dtype.py b/numpy/_core/tests/test_dtype.py
@@ -1466,7 +1466,7 @@ def test_complex_pyscalar_promote_rational(self):
     @pytest.mark.parametrize("val", [2, 2**32, 2**63, 2**64, 2*100])
     def test_python_integer_promotion(self, val):
         # If we only pass scalars (mainly python ones!), NEP 50 means
-        # that we get either the default integer
+        # that we get the default integer
         expected_dtype = np.dtype(int)  # the default integer
         assert np.result_type(val, 0) == expected_dtype
         # With NEP 50, the NumPy scalar wins though:

diff --git a/numpy/_core/tests/test_numeric.py b/numpy/_core/tests/test_numeric.py
@@ -1423,7 +1423,7 @@ def test_can_cast_structured_to_simple(self):
                                 casting='unsafe'))
 
     @pytest.mark.xfail(np._get_promotion_state() != "legacy",
-            reason="NEP 50: no int/float/complex (yet)")
+            reason="NEP 50: no python int/float/complex support (yet)")
     def test_can_cast_values(self):
         # gh-5917
         for dt in sctypes['int'] + sctypes['uint']:

diff --git a/numpy/_core/tests/test_umath.py b/numpy/_core/tests/test_umath.py
@@ -423,13 +423,13 @@ def test_unsigned_signed_direct_comparison(
         assert py_comp(arr, -1) == expected
         assert np_comp(arr, -1) == expected
 
-
         scalar = arr[0]
         assert isinstance(scalar, np.integer)
         # The Python operator here is mainly interesting:
         assert py_comp(scalar, -1) == expected
         assert np_comp(scalar, -1) == expected
 
+
 class TestAdd:
     def test_reduce_alignment(self):
         # gh-9876

diff --git a/numpy/lib/_function_base_impl.py b/numpy/lib/_function_base_impl.py
@@ -4462,7 +4462,7 @@ def quantile(a,
 
     # Use dtype of array if possible (e.g., if q is a python int or float).
     if isinstance(q, (int, float)) and a.dtype.kind == "f":
-        q = np.asanyarray(q, dtype=np.result_type(a, q))
+        q = np.asanyarray(q, dtype=a.dtype)
     else:
         q = np.asanyarray(q)
 

diff --git a/numpy/lib/_nanfunctions_impl.py b/numpy/lib/_nanfunctions_impl.py
@@ -1539,7 +1539,7 @@ def nanquantile(
 
     # Use dtype of array if possible (e.g., if q is a python int or float).
     if isinstance(q, (int, float)) and a.dtype.kind == "f":
-        q = np.asanyarray(q, dtype=np.result_type(a, q))
+        q = np.asanyarray(q, dtype=a.dtype)
     else:
         q = np.asanyarray(q)
 

diff --git a/numpy/typing/tests/data/pass/bitwise_ops.py b/numpy/typing/tests/data/pass/bitwise_ops.py
@@ -21,6 +21,12 @@
 i8 ^ i8
 i8 & i8
 
+i << AR
+i >> AR
+i | AR
+i ^ AR
+i & AR
+
 i8 << AR
 i8 >> AR
 i8 | AR
@@ -63,12 +69,6 @@
 u8 ^ u8
 u8 & u8
 
-i << AR
-i >> AR
-i | AR
-i ^ AR
-i & AR
-
 u4 << u4
 u4 >> u4
 u4 | u4
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,12 @@ @@
     i8 ^ i8
     i8 & i8
+    i << AR
+    i >> AR
+    i | AR
+    i ^ AR
+    i & AR
     i8 << AR
     i8 >> AR
     i8 | AR
@@ Expand Down Expand Up / @@ -63,12 +69,6 @@ @@
     u8 ^ u8
     u8 & u8
-    i << AR
-    i >> AR
-    i | AR
-    i ^ AR
-    i & AR
     u4 << u4
     u4 >> u4
     u4 | u4
@@ Expand Down @@