Skip to content

Commit 70531c8

Browse files
committed
🎨 sparse: IndexMixin code cleanup
1 parent 3945a95 commit 70531c8

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

‎scipy-stubs/sparse/_index.pyi

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ from ._typing import Complex, Float, Int, Scalar, Shape
1111
_SCT = TypeVar("_SCT", bound=Scalar, default=Any)
1212
_ShapeT_co = TypeVar("_ShapeT_co", bound=Shape, default=Shape, covariant=True)
1313

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])
1616

1717
_ToInt: TypeAlias = str | op.CanInt | op.CanIndex | op.CanTrunc | Buffer
1818
_ToFloat: TypeAlias = str | op.CanFloat | op.CanIndex | Buffer
1919
_ToComplex: TypeAlias = str | op.CanComplex | op.CanFloat | op.CanIndex | complex
2020

21+
_1D: TypeAlias = tuple[int] # noqa: PYI042
22+
_2D: TypeAlias = tuple[int, int] # noqa: PYI042
23+
2124
_ToIndex1D: TypeAlias = op.CanIndex | tuple[op.CanIndex]
2225
_ToIndex2D: TypeAlias = tuple[op.CanIndex, op.CanIndex]
2326

@@ -31,7 +34,7 @@ _ToSlice2D: TypeAlias = (
3134
| list[bool]
3235
| list[np.bool_]
3336
| list[int]
34-
| _spbase[np.bool_, tuple[int, int]]
37+
| _spbase[np.bool_, _2D]
3538
)
3639

3740
###
@@ -40,30 +43,30 @@ INT_TYPES: tuple[type[int], type[np.integer[Any]]] = ...
4043

4144
class IndexMixin(Generic[_SCT, _ShapeT_co]):
4245
@overload
43-
def __getitem__(self: IndexMixin[Any, tuple[int]], ix: op.CanIndex, /) -> _SCT: ...
46+
def __getitem__(self: IndexMixin[Any, _1D], ix: op.CanIndex, /) -> _SCT: ...
4447
@overload
45-
def __getitem__(self: IndexMixin[Any, tuple[int, int]], ix: _ToIndex2D, /) -> _SCT: ...
48+
def __getitem__(self: IndexMixin[Any, _2D], ix: _ToIndex2D, /) -> _SCT: ...
4649
@overload
4750
def __getitem__(self: _Self1DT, ixs: _ToSlice1D, /) -> _Self1DT: ...
4851
@overload
4952
def __getitem__(self: _Self2DT, ixs: _ToSlice2D, /) -> _Self2DT: ...
5053

5154
#
5255
@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: ...
5457
@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: ...
5659
@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: ...
5861
@overload
59-
def __setitem__(self: IndexMixin[Int], key: _ToIndex2D, x: _ToInt, /) -> None: ...
62+
def __setitem__(self: IndexMixin[Int], ix: _ToIndex2D, x: _ToInt, /) -> None: ...
6063
@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: ...
6265
@overload
63-
def __setitem__(self: IndexMixin[Float], key: _ToIndex2D, x: _ToFloat, /) -> None: ...
66+
def __setitem__(self: IndexMixin[Float], ix: _ToIndex2D, x: _ToFloat, /) -> None: ...
6467
@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: ...
6669
@overload
67-
def __setitem__(self: IndexMixin[Complex], key: _ToIndex2D, x: _ToComplex, /) -> None: ...
70+
def __setitem__(self: IndexMixin[Complex], ix: _ToIndex2D, x: _ToComplex, /) -> None: ...
6871
@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

Comments
 (0)