From 0b8f55c16a33fc5a1fe36fe1b2419e05386e92ad Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Sat, 14 Mar 2020 22:17:59 -0700 Subject: [PATCH 1/2] CLN: remove SingleBlockManager._values --- pandas/core/groupby/groupby.py | 2 +- pandas/core/internals/managers.py | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pandas/core/groupby/groupby.py b/pandas/core/groupby/groupby.py index 6362f11a3e032..4c7245671f2c8 100644 --- a/pandas/core/groupby/groupby.py +++ b/pandas/core/groupby/groupby.py @@ -2271,7 +2271,7 @@ def _get_cythonized_result( for idx, obj in enumerate(self._iterate_slices()): name = obj.name - values = obj._data._values + values = obj._data._block.values if aggregate: result_sz = ngroups diff --git a/pandas/core/internals/managers.py b/pandas/core/internals/managers.py index 93d4b02310d54..3c9c79eca69c5 100644 --- a/pandas/core/internals/managers.py +++ b/pandas/core/internals/managers.py @@ -1552,10 +1552,6 @@ def _post_setstate(self): def _block(self) -> Block: return self.blocks[0] - @property - def _values(self): - return self._block.values - @property def _blknos(self): """ compat with BlockManager """ From c40a84958c73f17c40c8a26b7ad13c858b5ec089 Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Mon, 16 Mar 2020 19:07:20 -0700 Subject: [PATCH 2/2] obj._data._block.values -> obj._values --- pandas/core/groupby/groupby.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/groupby/groupby.py b/pandas/core/groupby/groupby.py index 4c7245671f2c8..19e51d05feb92 100644 --- a/pandas/core/groupby/groupby.py +++ b/pandas/core/groupby/groupby.py @@ -1896,7 +1896,7 @@ def pre_processor(vals: np.ndarray) -> Tuple[np.ndarray, Optional[Type]]: inference = np.int64 elif is_datetime64_dtype(vals): inference = "datetime64[ns]" - vals = vals.astype(np.float) + vals = np.asarray(vals).astype(np.float) return vals, inference @@ -2271,7 +2271,7 @@ def _get_cythonized_result( for idx, obj in enumerate(self._iterate_slices()): name = obj.name - values = obj._data._block.values + values = obj._values if aggregate: result_sz = ngroups