Merge pull request numpy#26603 from mtsokol/array-copy-str

seberg · web-flow · commit 7f6ac7292b9a · 2024-06-05T11:59:37.000-07:00
BUG: Disallow string inputs for ``copy`` keyword in ``np.array`` and ``np.asarray``
diff --git a/numpy/_core/src/multiarray/conversion_utils.c b/numpy/_core/src/multiarray/conversion_utils.c
@@ -249,6 +249,12 @@ PyArray_CopyConverter(PyObject *obj, NPY_COPYMODE *copymode) {
             return NPY_FAIL;
         }
     }
+    else if(PyUnicode_Check(obj)) {
+        PyErr_SetString(PyExc_ValueError,
+                        "strings are not allowed for 'copy' keyword. "
+                        "Use True/False/None instead.");
+        return NPY_FAIL;
+    }
     else {
         npy_bool bool_copymode;
         if (!PyArray_BoolConverter(obj, &bool_copymode)) {
diff --git a/numpy/_core/tests/test_multiarray.py b/numpy/_core/tests/test_multiarray.py
@@ -503,6 +503,14 @@ def test_array_copy_true(self):
         assert_array_equal(e, [[1, 3, 7], [1, 2, 3]])
         assert_array_equal(d, [[1, 5, 3], [1,2,3]])
 
+    def test_array_copy_str(self):
+        with pytest.raises(
+            ValueError,
+            match="strings are not allowed for 'copy' keyword. "
+                  "Use True/False/None instead."
+        ):
+            np.array([1, 2, 3], copy="always")
+
     def test_array_cont(self):
         d = np.ones(10)[::2]
         assert_(np.ascontiguousarray(d).flags.c_contiguous)

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,12 @@ PyArray_CopyConverter(PyObject obj, NPY_COPYMODE copymode) {`
`249`	`249`	`return NPY_FAIL;`
`250`	`250`	`}`
`251`	`251`	`}`
	`252`	`+ else if(PyUnicode_Check(obj)) {`
	`253`	`+ PyErr_SetString(PyExc_ValueError,`
	`254`	`+ "strings are not allowed for 'copy' keyword. "`
	`255`	`+ "Use True/False/None instead.");`
	`256`	`+ return NPY_FAIL;`
	`257`	`+ }`
`252`	`258`	`else {`
`253`	`259`	`npy_bool bool_copymode;`
`254`	`260`	`if (!PyArray_BoolConverter(obj, &bool_copymode)) {`