From 04c4a86d028c93cdc088d04d43335fb99a31f3e4 Mon Sep 17 00:00:00 2001 From: Brock Date: Fri, 5 Nov 2021 19:02:14 -0700 Subject: [PATCH] CLN: remove _AXIS_REVERSED --- pandas/core/frame.py | 7 ++----- pandas/core/generic.py | 8 ++++---- pandas/core/internals/array_manager.py | 7 +------ pandas/core/internals/managers.py | 7 ++----- pandas/core/series.py | 1 - pandas/tests/internals/test_internals.py | 2 +- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 4e7f6329bb73b..ebf3428020652 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -1686,9 +1686,7 @@ def to_numpy( self._consolidate_inplace() if dtype is not None: dtype = np.dtype(dtype) - result = self._mgr.as_array( - transpose=self._AXIS_REVERSED, dtype=dtype, copy=copy, na_value=na_value - ) + result = self._mgr.as_array(dtype=dtype, copy=copy, na_value=na_value) if result.dtype is not dtype: result = np.array(result, dtype=dtype, copy=False) @@ -10715,7 +10713,6 @@ def isin(self, values) -> DataFrame: 1: 1, "columns": 1, } - _AXIS_REVERSED = True _AXIS_LEN = len(_AXIS_ORDERS) _info_axis_number = 1 _info_axis_name = "columns" @@ -10840,7 +10837,7 @@ def values(self) -> np.ndarray: ['monkey', nan, None]], dtype=object) """ self._consolidate_inplace() - return self._mgr.as_array(transpose=True) + return self._mgr.as_array() @deprecate_nonkeyword_arguments(version=None, allowed_args=["self"]) def ffill( diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 732508f9b7fb6..13e1c6e7e20b1 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -479,7 +479,6 @@ def _data(self): _stat_axis_name = "index" _AXIS_ORDERS: list[str] _AXIS_TO_AXIS_NUMBER: dict[Axis, int] = {0: 0, "index": 0, "rows": 0} - _AXIS_REVERSED: bool_t _info_axis_number: int _info_axis_name: str _AXIS_LEN: int @@ -566,9 +565,10 @@ def _get_axis(self, axis: Axis) -> Index: def _get_block_manager_axis(cls, axis: Axis) -> int: """Map the axis to the block_manager axis.""" axis = cls._get_axis_number(axis) - if cls._AXIS_REVERSED: - m = cls._AXIS_LEN - 1 - return m - axis + ndim = cls._AXIS_LEN + if ndim == 2: + # i.e. DataFrame + return 1 - axis return axis @final diff --git a/pandas/core/internals/array_manager.py b/pandas/core/internals/array_manager.py index fc7d2168c1c79..543b2ea26f750 100644 --- a/pandas/core/internals/array_manager.py +++ b/pandas/core/internals/array_manager.py @@ -1082,7 +1082,6 @@ def unstack(self, unstacker, fill_value) -> ArrayManager: def as_array( self, - transpose: bool = False, dtype=None, copy: bool = False, na_value=lib.no_default, @@ -1092,8 +1091,6 @@ def as_array( Parameters ---------- - transpose : bool, default False - If True, transpose the return array. dtype : object, default None Data type of the return array. copy : bool, default False @@ -1109,7 +1106,7 @@ def as_array( """ if len(self.arrays) == 0: empty_arr = np.empty(self.shape, dtype=float) - return empty_arr.transpose() if transpose else empty_arr + return empty_arr.transpose() # We want to copy when na_value is provided to avoid # mutating the original object @@ -1137,8 +1134,6 @@ def as_array( result[isna(result)] = na_value return result - # FIXME: don't leave commented-out - # return arr.transpose() if transpose else arr class SingleArrayManager(BaseArrayManager, SingleDataManager): diff --git a/pandas/core/internals/managers.py b/pandas/core/internals/managers.py index 7db19eda0f2fb..05a9aab4a5554 100644 --- a/pandas/core/internals/managers.py +++ b/pandas/core/internals/managers.py @@ -1465,7 +1465,6 @@ def to_dict(self, copy: bool = True): def as_array( self, - transpose: bool = False, dtype: np.dtype | None = None, copy: bool = False, na_value=lib.no_default, @@ -1475,8 +1474,6 @@ def as_array( Parameters ---------- - transpose : bool, default False - If True, transpose the return array. dtype : np.dtype or None, default None Data type of the return array. copy : bool, default False @@ -1492,7 +1489,7 @@ def as_array( """ if len(self.blocks) == 0: arr = np.empty(self.shape, dtype=float) - return arr.transpose() if transpose else arr + return arr.transpose() # We want to copy when na_value is provided to avoid # mutating the original object @@ -1524,7 +1521,7 @@ def as_array( if na_value is not lib.no_default: arr[isna(arr)] = na_value - return arr.transpose() if transpose else arr + return arr.transpose() def _interleave( self, diff --git a/pandas/core/series.py b/pandas/core/series.py index cfa3e90f8bc73..7ee9a0bcdd9e1 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -5498,7 +5498,6 @@ def mask( # ---------------------------------------------------------------------- # Add index _AXIS_ORDERS = ["index"] - _AXIS_REVERSED = False _AXIS_LEN = len(_AXIS_ORDERS) _info_axis_number = 0 _info_axis_name = "index" diff --git a/pandas/tests/internals/test_internals.py b/pandas/tests/internals/test_internals.py index 54706dc24fc42..b577bc7e436df 100644 --- a/pandas/tests/internals/test_internals.py +++ b/pandas/tests/internals/test_internals.py @@ -851,7 +851,7 @@ def test_validate_bool_args(self, value): def _as_array(mgr): if mgr.ndim == 1: return mgr.external_values() - return mgr.as_array() + return mgr.as_array().T class TestIndexing: