TYP: Use Self for type checking (remaining locations/)

Author: topper-123

.startup.ipy

@@ -12,7 +12,6 @@
     Hashable,
     Iterator,
     Literal,
-    TypeVar,
     cast,
     final,
     overload,
@@ -29,6 +28,7 @@
     DtypeObj,
     IndexLabel,
     NDFrameT,
+    Self,
     Shape,
     npt,
 )
@@ -91,8 +91,6 @@
     "duplicated": "IndexOpsMixin",
 }
 
-_T = TypeVar("_T", bound="IndexOpsMixin")
-
 
 class PandasObject(DirNamesMixin):
     """
@@ -285,7 +283,7 @@ def _values(self) -> ExtensionArray | np.ndarray:
         raise AbstractMethodError(self)
 
     @final
-    def transpose(self: _T, *args, **kwargs) -> _T:
+    def transpose(self, *args, **kwargs) -> Self:
         """
         Return the transpose, which is by definition self.
 

pandas/core/base.py

@@ -26,6 +26,7 @@
 if TYPE_CHECKING:
     from pandas._typing import (
         DtypeObj,
+        Self,
         Shape,
         npt,
         type_t,
@@ -228,9 +229,7 @@ def empty(self, shape: Shape) -> type_t[ExtensionArray]:
         return cls._empty(shape, dtype=self)
 
     @classmethod
-    def construct_from_string(
-        cls: type_t[ExtensionDtypeT], string: str
-    ) -> ExtensionDtypeT:
+    def construct_from_string(cls, string: str) -> Self:
         r"""
         Construct this type from a string.
 

pandas/core/dtypes/base.py

@@ -6,7 +6,6 @@
     TYPE_CHECKING,
     Hashable,
     Sequence,
-    TypeVar,
     cast,
     final,
 )
@@ -78,15 +77,14 @@
     from pandas._typing import (
         Axis,
         AxisInt,
+        Self,
     )
 
     from pandas import (
         DataFrame,
         Series,
     )
 
-_LocationIndexerT = TypeVar("_LocationIndexerT", bound="_LocationIndexer")
-
 # "null slice"
 _NS = slice(None, None)
 _one_ellipsis_message = "indexer may only contain one '...' entry"
@@ -669,9 +667,7 @@ class _LocationIndexer(NDFrameIndexerBase):
     _takeable: bool
 
     @final
-    def __call__(
-        self: _LocationIndexerT, axis: Axis | None = None
-    ) -> _LocationIndexerT:
+    def __call__(self, axis: Axis | None = None) -> Self:
         # we need to return a copy of ourselves
         new_self = type(self)(self.name, self.obj)
 

pandas/core/indexing.py

@@ -91,8 +91,8 @@
         ArrayLike,
         AxisInt,
         DtypeObj,
-        Self,
         QuantileInterpolation,
+        Self,
         npt,
     )
 
@@ -637,7 +637,6 @@ def take(
         indexer: npt.NDArray[np.intp],
         axis: AxisInt = 1,
         verify: bool = True,
-        convert_indices: bool = True,
     ) -> Self:
         """
         Take items along any axis.

pandas/core/internals/array_manager.py

@@ -34,6 +34,7 @@
         Shape,
     )
 
+
 class DataManager(PandasObject):
     # TODO share more methods/attributes
 

pandas/core/internals/base.py

@@ -86,7 +86,6 @@
         Self,
         Shape,
         npt,
-        type_t,
     )
 
 
@@ -929,7 +928,6 @@ def take(
         indexer: npt.NDArray[np.intp],
         axis: AxisInt = 1,
         verify: bool = True,
-        convert_indices: bool = True,
     ) -> Self:
         """
         Take items along any axis.