Merge pull request numpy#30190 from jorenham/ma.asanyarray-order-default

MAINT: ``ma.asanyarray``: use ``order=None`` as default

Author: charris

numpy/ma/core.py

@@ -8616,7 +8616,7 @@ def asarray(a, dtype=None, order=None):
                         subok=False, order=order)
 
 
-def asanyarray(a, dtype=None, order='A'):
+def asanyarray(a, dtype=None, order=None):
     """
     Convert the input to a masked array, conserving subclasses.
 
@@ -8629,14 +8629,13 @@ def asanyarray(a, dtype=None, order='A'):
         Input data, in any form that can be converted to an array.
     dtype : dtype, optional
         By default, the data-type is inferred from the input data.
-    order : {'C', 'F', 'A'}, optional
-        Specify the order of the array.  If order is 'C', then the array
-        will be in C-contiguous order (last-index varies the fastest).
-        If order is 'F', then the returned array will be in
-        Fortran-contiguous order (first-index varies the fastest).
-        If order is 'A' (default), then the returned array may be
-        in any order (either C-, Fortran-contiguous, or even discontiguous),
-        unless a copy is required, in which case it will be C-contiguous.
+    order : {'C', 'F', 'A', 'K'}, optional
+        Memory layout.  'A' and 'K' depend on the order of input array ``a``.
+        'C' row-major (C-style),
+        'F' column-major (Fortran-style) memory representation.
+        'A' (any) means 'F' if ``a`` is Fortran contiguous, 'C' otherwise
+        'K' (keep) preserve input order
+        Defaults to 'K'.
 
     Returns
     -------
@@ -8670,7 +8669,7 @@ def asanyarray(a, dtype=None, order='A'):
         isinstance(a, MaskedArray)
         and (dtype is None or dtype == a.dtype)
         and (
-            order == 'A'
+            order in {None, 'A', 'K'}
             or order == 'C' and a.flags.carray
             or order == 'F' and a.flags.f_contiguous
         )

numpy/ma/core.pyi

@@ -2453,13 +2453,13 @@ def asarray(a: object, dtype: DTypeLike | None = None, order: _OrderKACF | None
 
 # keep in sync with `asarray` (but note the additional first overload)
 @overload
-def asanyarray(a: _MArrayT, dtype: None = None, order: _OrderACF = "A") -> _MArrayT: ...
+def asanyarray(a: _MArrayT, dtype: None = None, order: _OrderKACF | None = None) -> _MArrayT: ...
 @overload
-def asanyarray(a: _ArrayLike[_ScalarT], dtype: None = None, order: _OrderACF = "A") -> _MaskedArray[_ScalarT]: ...
+def asanyarray(a: _ArrayLike[_ScalarT], dtype: None = None, order: _OrderKACF | None = None) -> _MaskedArray[_ScalarT]: ...
 @overload
-def asanyarray(a: object, dtype: _DTypeLike[_ScalarT], order: _OrderACF = "A") -> _MaskedArray[_ScalarT]: ...
+def asanyarray(a: object, dtype: _DTypeLike[_ScalarT], order: _OrderKACF | None = None) -> _MaskedArray[_ScalarT]: ...
 @overload
-def asanyarray(a: object, dtype: DTypeLike | None = None, order: _OrderACF = "A") -> _MaskedArray[_ScalarT]: ...
+def asanyarray(a: object, dtype: DTypeLike | None = None, order: _OrderKACF | None = None) -> _MaskedArray[_ScalarT]: ...
 
 #
 def is_masked(x: object) -> bool: ...