Apply review comments

hdlee · Apr 24, 2024 · c59773b · c59773b
1 parent fed445b
commit c59773b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/numpy/_core/fromnumeric.py b/numpy/_core/fromnumeric.py
@@ -320,7 +320,10 @@ def reshape(a, /, shape=None, *, newshape=None, order='C', copy=None):
             stacklevel=2,
         )
         shape = newshape
-    return _wrapfunc(a, 'reshape', shape, order=order, copy=copy)
+    kwargs = {"order": order}
+    if copy is not None:
+        kwargs["copy"] = copy
+    return _wrapfunc(a, 'reshape', shape, **kwargs)
 
 
 def _choose_dispatcher(a, choices, out=None, mode=None):

diff --git a/numpy/_core/src/multiarray/shape.c b/numpy/_core/src/multiarray/shape.c
@@ -248,6 +248,10 @@ _reshape_with_copy_arg(PyArrayObject *array, PyArray_Dims *newdims,
     if (_fix_unknown_dimension(newdims, array) < 0) {
         return NULL;
     }
+    /*
+     * Memory order doesn't depend on a copy/no-copy context.
+     * 'order' argument is always honored.
+     */
     if (copy == NPY_COPY_ALWAYS) {
         PyObject *newcopy = PyArray_NewCopy(array, order);
         if (newcopy == NULL) {