API: rename pandas/core/generic.py -> pandas/core.ndframe.py

.pre-commit-config.yaml

@@ -369,11 +369,11 @@ repos:
         files: ^pandas/
         exclude: ^pandas/tests/
         types: [python]
-    -   id: no-bool-in-core-generic
-        name: Use bool_t instead of bool in pandas/core/generic.py
-        entry: python scripts/no_bool_in_generic.py
+    -   id: no-bool-in-core-ndframe
+        name: Use bool_t instead of bool in pandas/core/ndframe.py
+        entry: python scripts/no_bool_in_ndframe.py
         language: python
-        files: ^pandas/core/generic\.py$
+        files: ^pandas/core/ndframe\.py$
     -   id: no-return-exception
         name: Use raise instead of return for exceptions
         language: pygrep

pandas/_typing.py

@@ -50,7 +50,6 @@
     )
     from pandas.core.arrays.base import ExtensionArray
     from pandas.core.frame import DataFrame
-    from pandas.core.generic import NDFrame
     from pandas.core.groupby.generic import (
         DataFrameGroupBy,
         GroupBy,
@@ -63,6 +62,7 @@
         SingleArrayManager,
         SingleBlockManager,
     )
+    from pandas.core.ndframe import NDFrame
     from pandas.core.resample import Resampler
     from pandas.core.series import Series
     from pandas.core.window.rolling import BaseWindow

pandas/core/arraylike.py

@@ -262,8 +262,8 @@ def array_ufunc(self, ufunc: np.ufunc, method: str, *inputs: Any, **kwargs: Any)
         DataFrame,
         Series,
     )
-    from pandas.core.generic import NDFrame
     from pandas.core.internals import BlockManager
+    from pandas.core.ndframe import NDFrame
 
     cls = type(self)
 

pandas/core/computation/align.py

@@ -31,8 +31,8 @@
 if TYPE_CHECKING:
     from pandas._typing import F
 
-    from pandas.core.generic import NDFrame
     from pandas.core.indexes.api import Index
+    from pandas.core.ndframe import NDFrame
 
 
 def _align_core_single_unary_op(

pandas/core/computation/eval.py

@@ -16,7 +16,7 @@
 )
 from pandas.core.computation.parsing import tokenize_string
 from pandas.core.computation.scope import ensure_scope
-from pandas.core.generic import NDFrame
+from pandas.core.ndframe import NDFrame
 
 from pandas.io.formats.printing import pprint_thing
 

pandas/core/dtypes/generic.py

@@ -28,7 +28,7 @@
         PeriodArray,
         TimedeltaArray,
     )
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 
 # define abstract base classes to enable isinstance type checking on our

pandas/core/frame.py

@@ -179,7 +179,6 @@
     sanitize_array,
     sanitize_masked_array,
 )
-from pandas.core.generic import NDFrame
 from pandas.core.indexers import check_key_length
 from pandas.core.indexes.api import (
     DatetimeIndex,
@@ -213,6 +212,7 @@
     to_arrays,
     treat_as_nested,
 )
+from pandas.core.ndframe import NDFrame
 from pandas.core.reshape.melt import melt
 from pandas.core.series import Series
 from pandas.core.shared_docs import _shared_docs

pandas/core/groupby/generic.py

@@ -97,7 +97,7 @@
 from pandas.plotting import boxplot_frame_groupby
 
 if TYPE_CHECKING:
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 # TODO(typing) the return value on this callable should be any *scalar*.
 AggScalar = Union[str, Callable[..., Any]]

pandas/core/groupby/groupby.py

@@ -106,7 +106,6 @@ class providing the base-class of operations.
 )
 import pandas.core.common as com
 from pandas.core.frame import DataFrame
-from pandas.core.generic import NDFrame
 from pandas.core.groupby import (
     base,
     numba_,
@@ -125,6 +124,7 @@ class providing the base-class of operations.
     default_index,
 )
 from pandas.core.internals.blocks import ensure_block_shape
+from pandas.core.ndframe import NDFrame
 from pandas.core.series import Series
 from pandas.core.sorting import get_group_index_sorter
 from pandas.core.util.numba_ import (

pandas/core/groupby/grouper.py

@@ -50,7 +50,7 @@
 from pandas.io.formats.printing import pprint_thing
 
 if TYPE_CHECKING:
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 
 class Grouper:

pandas/core/groupby/ops.py

@@ -96,7 +96,7 @@
 )
 
 if TYPE_CHECKING:
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 
 class WrappedCythonOp:

pandas/core/resample.py

@@ -57,10 +57,6 @@
 from pandas.core.apply import ResamplerWindowApply
 from pandas.core.base import PandasObject
 import pandas.core.common as com
-from pandas.core.generic import (
-    NDFrame,
-    _shared_docs,
-)
 from pandas.core.groupby.generic import SeriesGroupBy
 from pandas.core.groupby.groupby import (
     BaseGroupBy,
@@ -82,6 +78,10 @@
     TimedeltaIndex,
     timedelta_range,
 )
+from pandas.core.ndframe import (
+    NDFrame,
+    _shared_docs,
+)
 
 from pandas.tseries.frequencies import (
     is_subperiod,

pandas/core/reshape/concat.py

@@ -60,7 +60,7 @@
         DataFrame,
         Series,
     )
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 # ---------------------------------------------------------------------
 # Concatenate DataFrame objects

pandas/core/sample.py

@@ -16,7 +16,7 @@
 )
 
 if TYPE_CHECKING:
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 
 def preprocess_weights(obj: NDFrame, weights, axis: AxisInt) -> np.ndarray:

pandas/core/series.py

@@ -132,7 +132,6 @@
     extract_array,
     sanitize_array,
 )
-from pandas.core.generic import NDFrame
 from pandas.core.indexers import (
     disallow_ndim_indexing,
     unpack_1tuple,
@@ -156,6 +155,7 @@
     SingleArrayManager,
     SingleBlockManager,
 )
+from pandas.core.ndframe import NDFrame
 from pandas.core.shared_docs import _shared_docs
 from pandas.core.sorting import (
     ensure_key_mapped,

pandas/core/window/ewm.py

@@ -16,7 +16,7 @@
 
 if TYPE_CHECKING:
     from pandas import DataFrame, Series
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 from pandas.util._decorators import doc
 

pandas/core/window/expanding.py

@@ -15,7 +15,7 @@
 
 if TYPE_CHECKING:
     from pandas import DataFrame, Series
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 from pandas.util._decorators import doc
 

pandas/core/window/rolling.py

@@ -103,8 +103,8 @@
         DataFrame,
         Series,
     )
-    from pandas.core.generic import NDFrame
     from pandas.core.groupby.ops import BaseGrouper
+    from pandas.core.ndframe import NDFrame
 
 
 class BaseWindow(SelectionMixin):

pandas/io/formats/style.py

@@ -48,7 +48,7 @@
     DataFrame,
     Series,
 )
-from pandas.core.generic import NDFrame
+from pandas.core.ndframe import NDFrame
 from pandas.core.shared_docs import _shared_docs
 
 from pandas.io.formats.format import save_to_buffer

pandas/io/json/_json.py

@@ -78,7 +78,7 @@
 from pandas.io.parsers.readers import validate_integer
 
 if TYPE_CHECKING:
-    from pandas.core.generic import NDFrame
+    from pandas.core.ndframe import NDFrame
 
 FrameSeriesStrT = TypeVar("FrameSeriesStrT", bound=Literal["frame", "series"])
 

scripts/no_bool_in_generic.py → scripts/no_bool_in_ndframe.py

@@ -1,11 +1,11 @@
 """
-Check that pandas/core/generic.py doesn't use bool as a type annotation.
+Check that pandas/core/ndframe.py doesn't use bool as a type annotation.
 
 There is already the method `bool`, so the alias `bool_t` should be used instead.
 
 This is meant to be run as a pre-commit hook - to run it manually, you can do:
 
-    pre-commit run no-bool-in-core-generic --all-files
+    pre-commit run no-bool-in-core-ndframe --all-files
 
 The function `visit` is adapted from a function by the same name in pyupgrade:
 https://github.com/asottile/pyupgrade/blob/5495a248f2165941c5d3b82ac3226ba7ad1fa59d/pyupgrade/_data.py#L70-L113
@@ -57,7 +57,7 @@ def replace_bool_with_bool_t(to_replace, content: str) -> str:
     return "\n".join(new_lines)
 
 
-def check_for_bool_in_generic(content: str) -> tuple[bool, str]:
+def check_for_bool_in_ndframe(content: str) -> tuple[bool, str]:
     tree = ast.parse(content)
     to_replace = visit(tree)
 
@@ -77,7 +77,7 @@ def main(argv: Sequence[str] | None = None) -> None:
     for path in args.paths:
         with open(path, encoding="utf-8") as fd:
             content = fd.read()
-        mutated, new_content = check_for_bool_in_generic(content)
+        mutated, new_content = check_for_bool_in_ndframe(content)
         if mutated:
             with open(path, "w", encoding="utf-8") as fd:
                 fd.write(new_content)

scripts/tests/test_no_bool_in_generic.py → scripts/tests/test_no_bool_in_ndframe.py

@@ -1,20 +1,20 @@
-from scripts.no_bool_in_generic import check_for_bool_in_generic
+from scripts.no_bool_in_ndframe import check_for_bool_in_ndframe
 
 BAD_FILE = "def foo(a: bool) -> bool:\n    return bool(0)"
 GOOD_FILE = "def foo(a: bool_t) -> bool_t:\n    return bool(0)"
 
 
 def test_bad_file_with_replace():
     content = BAD_FILE
-    mutated, result = check_for_bool_in_generic(content)
+    mutated, result = check_for_bool_in_ndframe(content)
     expected = GOOD_FILE
     assert result == expected
     assert mutated
 
 
 def test_good_file_with_replace():
     content = GOOD_FILE
-    mutated, result = check_for_bool_in_generic(content)
+    mutated, result = check_for_bool_in_ndframe(content)
     expected = content
     assert result == expected
     assert not mutated