@@ -11,13 +11,16 @@ from ._typing import Complex, Float, Int, Scalar, Shape
11
11
_SCT = TypeVar ("_SCT" , bound = Scalar , default = Any )
12
12
_ShapeT_co = TypeVar ("_ShapeT_co" , bound = Shape , default = Shape , covariant = True )
13
13
14
- _Self1DT = TypeVar ("_Self1DT" , bound = IndexMixin [Any , tuple [ int ] ])
15
- _Self2DT = TypeVar ("_Self2DT" , bound = IndexMixin [Any , tuple [ int , int ] ])
14
+ _Self1DT = TypeVar ("_Self1DT" , bound = IndexMixin [Any , _1D ])
15
+ _Self2DT = TypeVar ("_Self2DT" , bound = IndexMixin [Any , _2D ])
16
16
17
17
_ToInt : TypeAlias = str | op .CanInt | op .CanIndex | op .CanTrunc | Buffer
18
18
_ToFloat : TypeAlias = str | op .CanFloat | op .CanIndex | Buffer
19
19
_ToComplex : TypeAlias = str | op .CanComplex | op .CanFloat | op .CanIndex | complex
20
20
21
+ _1D : TypeAlias = tuple [int ] # noqa: PYI042
22
+ _2D : TypeAlias = tuple [int , int ] # noqa: PYI042
23
+
21
24
_ToIndex1D : TypeAlias = op .CanIndex | tuple [op .CanIndex ]
22
25
_ToIndex2D : TypeAlias = tuple [op .CanIndex , op .CanIndex ]
23
26
@@ -31,7 +34,7 @@ _ToSlice2D: TypeAlias = (
31
34
| list [bool ]
32
35
| list [np .bool_ ]
33
36
| list [int ]
34
- | _spbase [np .bool_ , tuple [ int , int ] ]
37
+ | _spbase [np .bool_ , _2D ]
35
38
)
36
39
37
40
###
@@ -40,30 +43,30 @@ INT_TYPES: tuple[type[int], type[np.integer[Any]]] = ...
40
43
41
44
class IndexMixin (Generic [_SCT , _ShapeT_co ]):
42
45
@overload
43
- def __getitem__ (self : IndexMixin [Any , tuple [ int ] ], ix : op .CanIndex , / ) -> _SCT : ...
46
+ def __getitem__ (self : IndexMixin [Any , _1D ], ix : op .CanIndex , / ) -> _SCT : ...
44
47
@overload
45
- def __getitem__ (self : IndexMixin [Any , tuple [ int , int ] ], ix : _ToIndex2D , / ) -> _SCT : ...
48
+ def __getitem__ (self : IndexMixin [Any , _2D ], ix : _ToIndex2D , / ) -> _SCT : ...
46
49
@overload
47
50
def __getitem__ (self : _Self1DT , ixs : _ToSlice1D , / ) -> _Self1DT : ...
48
51
@overload
49
52
def __getitem__ (self : _Self2DT , ixs : _ToSlice2D , / ) -> _Self2DT : ...
50
53
51
54
#
52
55
@overload
53
- def __setitem__ (self : IndexMixin [Any , tuple [ int ]], key : op .CanIndex | _ToSlice1D , x : _SCT , / ) -> None : ...
56
+ def __setitem__ (self : IndexMixin [Any , _1D ], ix : op .CanIndex | _ToSlice1D , x : _SCT , / ) -> None : ...
54
57
@overload
55
- def __setitem__ (self : IndexMixin [Any ], key : _ToIndex2D | _ToSlice2D , x : _SCT , / ) -> None : ...
58
+ def __setitem__ (self : IndexMixin [Any ], ix : _ToIndex2D | _ToSlice2D , x : _SCT , / ) -> None : ...
56
59
@overload
57
- def __setitem__ (self : IndexMixin [Int , tuple [ int ]], key : _ToIndex1D , x : _ToInt , / ) -> None : ...
60
+ def __setitem__ (self : IndexMixin [Int , _1D ], ix : _ToIndex1D , x : _ToInt , / ) -> None : ...
58
61
@overload
59
- def __setitem__ (self : IndexMixin [Int ], key : _ToIndex2D , x : _ToInt , / ) -> None : ...
62
+ def __setitem__ (self : IndexMixin [Int ], ix : _ToIndex2D , x : _ToInt , / ) -> None : ...
60
63
@overload
61
- def __setitem__ (self : IndexMixin [Float , tuple [ int ]], key : _ToIndex1D , x : _ToFloat , / ) -> None : ...
64
+ def __setitem__ (self : IndexMixin [Float , _1D ], ix : _ToIndex1D , x : _ToFloat , / ) -> None : ...
62
65
@overload
63
- def __setitem__ (self : IndexMixin [Float ], key : _ToIndex2D , x : _ToFloat , / ) -> None : ...
66
+ def __setitem__ (self : IndexMixin [Float ], ix : _ToIndex2D , x : _ToFloat , / ) -> None : ...
64
67
@overload
65
- def __setitem__ (self : IndexMixin [Complex , tuple [ int ]], key : _ToIndex1D , x : _ToComplex , / ) -> None : ...
68
+ def __setitem__ (self : IndexMixin [Complex , _1D ], ix : _ToIndex1D , x : _ToComplex , / ) -> None : ...
66
69
@overload
67
- def __setitem__ (self : IndexMixin [Complex ], key : _ToIndex2D , x : _ToComplex , / ) -> None : ...
70
+ def __setitem__ (self : IndexMixin [Complex ], ix : _ToIndex2D , x : _ToComplex , / ) -> None : ...
68
71
@overload
69
- def __setitem__ (self , key : _ToIndex1D | _ToSlice1D | _ToIndex2D | _ToSlice2D , x : object , / ) -> None : ...
72
+ def __setitem__ (self , ix : _ToIndex1D | _ToSlice1D | _ToIndex2D | _ToSlice2D , x : object , / ) -> None : ...
0 commit comments