Rename generic.py to ndframe.py commit2

.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