Merge branch 'master' into cy-mgr-3

pandas-dev · jreback · Apr 19, 2021 · Mar 25, 2021 · Mar 25, 2021 · Mar 26, 2021
commit a10825883516662795838dce7ac153c322e309a0
diff --git a/pandas/core/internals/managers.py b/pandas/core/internals/managers.py
@@ -81,10 +81,10 @@
 
 # TODO: flexible with index=None and/or items=None
 
-T = TypeVar("T", bound="_BlockManager")
+T = TypeVar("T", bound="BaseBlockManager")
 
 
-class _BlockManager(DataManager):
+class BaseBlockManager(DataManager):
     """
     Core internal data structure to implement DataFrame, Series, etc.
 
@@ -150,7 +150,7 @@ def __init__(self, blocks, axes, verify_integrity=True):
         raise NotImplementedError
 
     @classmethod
-    def from_blocks(cls: type[T], blocks: list[Block], axes: list[Index]) -> T:
+    def from_blocks(cls: type_t[T], blocks: list[Block], axes: list[Index]) -> T:
         raise NotImplementedError
 
     @property
@@ -1327,9 +1327,9 @@ def take(self: T, indexer, axis: int = 1, verify: bool = True) -> T:
         )
 
 
-class BlockManager(libinternals.BlockManager, _BlockManager):
+class BlockManager(libinternals.BlockManager, BaseBlockManager):
     """
-    _BlockManager that holds 2D blocks.
+    BaseBlockManager that holds 2D blocks.
     """
 
     ndim = 2
@@ -1476,7 +1476,7 @@ def unstack(self, unstacker, fill_value) -> BlockManager:
         return bm
 
 
-class SingleBlockManager(_BlockManager, SingleDataManager):
+class SingleBlockManager(BaseBlockManager, SingleDataManager):
     """ manage a single block with """
 
     ndim = 1