Merge pull request #27597 from meeseeksmachine/auto-backport-of-pr-27595-on-v3.8.x

QuLogic · web-flow · commit 86e5a458400b · 2024-01-04T05:00:54.000-05:00
Backport PR #27595 on branch v3.8.x (Fix is_sorted_and_has_non_nan for byteswapped inputs.)
diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
@@ -249,6 +249,8 @@ def test_is_sorted_and_has_non_nan():
     assert _path.is_sorted_and_has_non_nan(np.array([1, 2, 3]))
     assert _path.is_sorted_and_has_non_nan(np.array([1, np.nan, 3]))
     assert not _path.is_sorted_and_has_non_nan([3, 5] + [np.nan] * 100 + [0, 2])
+    # [2, 256] byteswapped:
+    assert not _path.is_sorted_and_has_non_nan(np.array([33554432, 65536], ">i4"))
     n = 2 * mlines.Line2D._subslice_optim_min_size
     plt.plot([np.nan] * n, range(n))
 
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -699,8 +699,8 @@ static PyObject *Py_is_sorted_and_has_non_nan(PyObject *self, PyObject *obj)
 {
     bool result;
 
-    PyArrayObject *array = (PyArrayObject *)PyArray_FromAny(
-        obj, NULL, 1, 1, 0, NULL);
+    PyArrayObject *array = (PyArrayObject *)PyArray_CheckFromAny(
+        obj, NULL, 1, 1, NPY_ARRAY_NOTSWAPPED, NULL);
 
     if (array == NULL) {
         return NULL;

Original file line number	Diff line number	Diff line change
`@@ -699,8 +699,8 @@ static PyObject Py_is_sorted_and_has_non_nan(PyObject self, PyObject *obj)`
`699`	`699`	`{`
`700`	`700`	`bool result;`
`701`	`701`
`702`		`- PyArrayObject array = (PyArrayObject )PyArray_FromAny(`
`703`		`- obj, NULL, 1, 1, 0, NULL);`
	`702`	`+ PyArrayObject array = (PyArrayObject )PyArray_CheckFromAny(`
	`703`	`+ obj, NULL, 1, 1, NPY_ARRAY_NOTSWAPPED, NULL);`
`704`	`704`
`705`	`705`	`if (array == NULL) {`
`706`	`706`	`return NULL;`