self

simonjayhawkins · Nov 12, 2024 · ae7da21 · ae7da21
1 parent d3c595e
commit ae7da21
Show file tree

Hide file tree

Showing 56 changed files with 72 additions and 85 deletions.
diff --git a/pandas/_libs/arrays.pyi b/pandas/_libs/arrays.pyi
@@ -1,11 +1,13 @@
-from typing import Sequence
+from typing import (
+    Self,
+    Sequence,
+)
 
 import numpy as np
 
 from pandas._typing import (
     AxisInt,
     DtypeObj,
-    Self,
     Shape,
 )
 

diff --git a/pandas/_libs/internals.pyi b/pandas/_libs/internals.pyi
@@ -1,5 +1,6 @@
 from typing import (
     Iterator,
+    Self,
     Sequence,
     final,
     overload,
@@ -10,7 +11,6 @@ import numpy as np
 
 from pandas._typing import (
     ArrayLike,
-    Self,
     npt,
 )
 

diff --git a/pandas/_libs/sparse.pyi b/pandas/_libs/sparse.pyi
@@ -1,11 +1,11 @@
-from typing import Sequence
+from typing import (
+    Self,
+    Sequence,
+)
 
 import numpy as np
 
-from pandas._typing import (
-    Self,
-    npt,
-)
+from pandas._typing import npt
 
 class SparseIndex:
     length: int

diff --git a/pandas/_libs/tslibs/dtypes.pyi b/pandas/_libs/tslibs/dtypes.pyi
@@ -1,6 +1,5 @@
 from enum import Enum
-
-from pandas._typing import Self
+from typing import Self
 
 OFFSET_TO_PERIOD_FREQSTR: dict[str, str]
 

diff --git a/pandas/_libs/tslibs/nattype.pyi b/pandas/_libs/tslibs/nattype.pyi
@@ -8,6 +8,7 @@ from datetime import (
 from typing import (
     Literal,
     NoReturn,
+    Self,
     TypeAlias,
     overload,
 )
@@ -17,7 +18,6 @@ import numpy as np
 from pandas._libs.tslibs.period import Period
 from pandas._typing import (
     Frequency,
-    Self,
     TimestampNonexistent,
 )
 

diff --git a/pandas/_libs/tslibs/offsets.pyi b/pandas/_libs/tslibs/offsets.pyi
@@ -7,6 +7,7 @@ from typing import (
     Any,
     Collection,
     Literal,
+    Self,
     TypeVar,
     overload,
 )
@@ -16,7 +17,6 @@ import numpy as np
 from pandas._libs.tslibs.nattype import NaTType
 from pandas._typing import (
     OffsetCalendar,
-    Self,
     npt,
 )
 

diff --git a/pandas/_libs/tslibs/timedeltas.pyi b/pandas/_libs/tslibs/timedeltas.pyi
@@ -2,6 +2,7 @@ from datetime import timedelta
 from typing import (
     ClassVar,
     Literal,
+    Self,
     TypeAlias,
     TypeVar,
     overload,
@@ -15,7 +16,6 @@ from pandas._libs.tslibs import (
 )
 from pandas._typing import (
     Frequency,
-    Self,
     npt,
 )
 

diff --git a/pandas/_libs/tslibs/timestamps.pyi b/pandas/_libs/tslibs/timestamps.pyi
@@ -9,6 +9,7 @@ from time import struct_time
 from typing import (
     ClassVar,
     Literal,
+    Self,
     TypeAlias,
     overload,
 )
@@ -22,10 +23,7 @@ from pandas._libs.tslibs import (
     Tick,
     Timedelta,
 )
-from pandas._typing import (
-    Self,
-    TimestampNonexistent,
-)
+from pandas._typing import TimestampNonexistent
 
 _TimeZones: TypeAlias = str | _tzinfo | None | int
 

diff --git a/pandas/_typing.py b/pandas/_typing.py
@@ -15,7 +15,6 @@
     tzinfo,
 )
 from os import PathLike
-import sys
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -99,17 +98,9 @@
 
     P = ParamSpec("P")
 
-    if sys.version_info >= (3, 11):
-        from typing import Self  # pyright: ignore[reportUnusedImport]
-        from typing import Unpack  # pyright: ignore[reportUnusedImport]
-    else:
-        from typing_extensions import Self  # pyright: ignore[reportUnusedImport]
-        from typing_extensions import Unpack  # pyright: ignore[reportUnusedImport]
-
 else:
     npt: Any = None
     ParamSpec: Any = None
-    Self: Any = None
     TypeGuard: Any = None
     Concatenate: Any = None
     Unpack: Any = None

diff --git a/pandas/core/arrays/_arrow_string_mixins.py b/pandas/core/arrays/_arrow_string_mixins.py
@@ -6,6 +6,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
 )
 
 import numpy as np
@@ -25,10 +26,7 @@
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    from pandas._typing import (
-        Scalar,
-        Self,
-    )
+    from pandas._typing import Scalar
 
 
 class ArrowStringArrayMixin:

diff --git a/pandas/core/arrays/_mixins.py b/pandas/core/arrays/_mixins.py
@@ -5,6 +5,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
     cast,
     overload,
 )
@@ -23,7 +24,6 @@
     PositionalIndexer2D,
     PositionalIndexerTuple,
     ScalarIndexer,
-    Self,
     SequenceIndexer,
     Shape,
     TakeIndexer,

diff --git a/pandas/core/arrays/arrow/array.py b/pandas/core/arrays/arrow/array.py
@@ -8,6 +8,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
     cast,
     overload,
 )
@@ -193,7 +194,6 @@ def floordiv_compat(
         NumpyValueArrayLike,
         PositionalIndexer,
         Scalar,
-        Self,
         SortKind,
         TakeIndexer,
         TimeAmbiguous,

diff --git a/pandas/core/arrays/base.py b/pandas/core/arrays/base.py
@@ -15,6 +15,7 @@
     Any,
     ClassVar,
     Literal,
+    Self,
     cast,
     overload,
 )
@@ -95,7 +96,6 @@
         NumpyValueArrayLike,
         PositionalIndexer,
         ScalarIndexer,
-        Self,
         SequenceIndexer,
         Shape,
         SortKind,

diff --git a/pandas/core/arrays/boolean.py b/pandas/core/arrays/boolean.py
@@ -4,6 +4,7 @@
 from typing import (
     TYPE_CHECKING,
     ClassVar,
+    Self,
     cast,
 )
 
@@ -30,7 +31,6 @@
 
     from pandas._typing import (
         DtypeObj,
-        Self,
         npt,
         type_t,
     )

diff --git a/pandas/core/arrays/categorical.py b/pandas/core/arrays/categorical.py
@@ -7,6 +7,7 @@
 from typing import (
     TYPE_CHECKING,
     Literal,
+    Self,
     cast,
     overload,
 )
@@ -105,7 +106,6 @@
         DtypeObj,
         NpDtype,
         Ordered,
-        Self,
         Shape,
         SortKind,
         npt,

diff --git a/pandas/core/arrays/datetimelike.py b/pandas/core/arrays/datetimelike.py
@@ -10,6 +10,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
     Union,
     cast,
     final,
@@ -64,7 +65,6 @@
     PositionalIndexer2D,
     PositionalIndexerTuple,
     ScalarIndexer,
-    Self,
     SequenceIndexer,
     TakeIndexer,
     TimeAmbiguous,

diff --git a/pandas/core/arrays/datetimes.py b/pandas/core/arrays/datetimes.py
@@ -7,6 +7,7 @@
 )
 from typing import (
     TYPE_CHECKING,
+    Self,
     TypeVar,
     cast,
     overload,
@@ -84,7 +85,6 @@
         DateTimeErrorChoices,
         DtypeObj,
         IntervalClosedType,
-        Self,
         TimeAmbiguous,
         TimeNonexistent,
         npt,

diff --git a/pandas/core/arrays/interval.py b/pandas/core/arrays/interval.py
@@ -9,6 +9,7 @@
 from typing import (
     TYPE_CHECKING,
     Literal,
+    Self,
     Union,
     overload,
 )
@@ -31,7 +32,6 @@
     NpDtype,
     PositionalIndexer,
     ScalarIndexer,
-    Self,
     SequenceIndexer,
     SortKind,
     TimeArrayLike,

diff --git a/pandas/core/arrays/masked.py b/pandas/core/arrays/masked.py
@@ -4,6 +4,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
     cast,
     overload,
 )
@@ -92,7 +93,6 @@
         PositionalIndexer,
         Scalar,
         ScalarIndexer,
-        Self,
         SequenceIndexer,
         Shape,
         npt,

diff --git a/pandas/core/arrays/numeric.py b/pandas/core/arrays/numeric.py
@@ -4,6 +4,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    Self,
 )
 
 import numpy as np
@@ -36,7 +37,6 @@
 
     from pandas._typing import (
         DtypeObj,
-        Self,
         npt,
     )
 

diff --git a/pandas/core/arrays/numpy_.py b/pandas/core/arrays/numpy_.py
@@ -3,6 +3,7 @@
 from typing import (
     TYPE_CHECKING,
     Literal,
+    Self,
 )
 
 import numpy as np
@@ -36,7 +37,6 @@
         InterpolateOptions,
         NpDtype,
         Scalar,
-        Self,
         npt,
     )
 

diff --git a/pandas/core/arrays/period.py b/pandas/core/arrays/period.py
@@ -6,6 +6,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
     TypeVar,
     cast,
     overload,
@@ -86,7 +87,6 @@
         NpDtype,
         NumpySorter,
         NumpyValueArrayLike,
-        Self,
         npt,
     )
 

diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py
@@ -11,6 +11,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
     cast,
     overload,
 )
@@ -113,7 +114,6 @@ class ellipsis(Enum):
         PositionalIndexer,
         Scalar,
         ScalarIndexer,
-        Self,
         SequenceIndexer,
         npt,
     )

diff --git a/pandas/core/arrays/string_.py b/pandas/core/arrays/string_.py
@@ -6,6 +6,7 @@
     TYPE_CHECKING,
     Any,
     Literal,
+    Self,
     cast,
 )
 import warnings
@@ -81,7 +82,6 @@
         NumpySorter,
         NumpyValueArrayLike,
         Scalar,
-        Self,
         npt,
         type_t,
     )