Skip to content

Commit e3476b2

Browse files
ngoldbaumngoldbaum
committed
TYP: really fix spin mypy
1 parent 4680489 commit e3476b2

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

‎numpy/_core/defchararray.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ def center(a: S_co, width: i_co, fillchar: S_co = ...) -> NDArray[bytes_]: ...
606606
@overload
607607
def center(a: _StringDTypeSupportsArray, width: i_co, fillchar: _StringDTypeSupportsArray = ...) -> _StringDTypeArray: ...
608608
@overload
609-
def center(a: T_co, width: T_co, fillchar: T_co = ...) -> _StringDTypeOrUnicodeArray: ...
609+
def center(a: T_co, width: i_co, fillchar: T_co = ...) -> _StringDTypeOrUnicodeArray: ...
610610

611611
def decode(
612612
a: S_co,

‎numpy/_core/strings.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def center(a: S_co, width: i_co, fillchar: S_co = ...) -> NDArray[np.bytes_]: ..
280280
@overload
281281
def center(a: _StringDTypeSupportsArray, width: i_co, fillchar: _StringDTypeSupportsArray = ...) -> _StringDTypeArray: ...
282282
@overload
283-
def center(a: T_co, width: T_co, fillchar: T_co = ...) -> _StringDTypeOrUnicodeArray: ...
283+
def center(a: T_co, width: i_co, fillchar: T_co = ...) -> _StringDTypeOrUnicodeArray: ...
284284

285285
@overload
286286
def ljust(a: U_co, width: i_co, fillchar: U_co = ...) -> NDArray[np.str_]: ...

‎numpy/typing/tests/data/reveal/char.pyi

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ AR_S: npt.NDArray[np.bytes_]
1010
AR_T: np.ndarray[np_t._Shape, np.dtypes.StringDType]
1111

1212
AR_T_alias: TypeAlias = np.ndarray[np_t._Shape, np.dtypes.StringDType]
13+
AR_TU_alias: TypeAlias = AR_T_alias | npt.NDArray[np.str_]
1314

1415
assert_type(np.char.equal(AR_U, AR_U), npt.NDArray[np.bool])
1516
assert_type(np.char.equal(AR_S, AR_S), npt.NDArray[np.bool])
@@ -50,7 +51,6 @@ assert_type(np.char.capitalize(AR_T), AR_T_alias)
5051
assert_type(np.char.center(AR_U, 5), npt.NDArray[np.str_])
5152
assert_type(np.char.center(AR_S, [2, 3, 4], b"a"), npt.NDArray[np.bytes_])
5253
assert_type(np.char.center(AR_T, 5), AR_T_alias)
53-
assert_type(np.char.center(AR_T, [2, 3, 4], "a"), AR_T_alias)
5454

5555
assert_type(np.char.encode(AR_U), npt.NDArray[np.bytes_])
5656
assert_type(np.char.encode(AR_T), npt.NDArray[np.bytes_])
@@ -62,49 +62,49 @@ assert_type(np.char.expandtabs(AR_T), AR_T_alias)
6262

6363
assert_type(np.char.join(AR_U, "_"), npt.NDArray[np.str_])
6464
assert_type(np.char.join(AR_S, [b"_", b""]), npt.NDArray[np.bytes_])
65-
assert_type(np.char.join(AR_T, "_"), AR_T_alias)
65+
assert_type(np.char.join(AR_T, "_"), AR_TU_alias)
6666

6767
assert_type(np.char.ljust(AR_U, 5), npt.NDArray[np.str_])
6868
assert_type(np.char.ljust(AR_S, [4, 3, 1], fillchar=[b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
6969
assert_type(np.char.ljust(AR_T, 5), AR_T_alias)
70-
assert_type(np.char.ljust(AR_T, [4, 2, 1], fillchar=["a", "b", "c"]), AR_T_alias)
70+
assert_type(np.char.ljust(AR_T, [4, 2, 1], fillchar=["a", "b", "c"]), AR_TU_alias)
7171

7272
assert_type(np.char.rjust(AR_U, 5), npt.NDArray[np.str_])
7373
assert_type(np.char.rjust(AR_S, [4, 3, 1], fillchar=[b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
7474
assert_type(np.char.rjust(AR_T, 5), AR_T_alias)
75-
assert_type(np.char.rjust(AR_T, [4, 2, 1], fillchar=["a", "b", "c"]), AR_T_alias)
75+
assert_type(np.char.rjust(AR_T, [4, 2, 1], fillchar=["a", "b", "c"]), AR_TU_alias)
7676

7777
assert_type(np.char.lstrip(AR_U), npt.NDArray[np.str_])
7878
assert_type(np.char.lstrip(AR_S, b"_"), npt.NDArray[np.bytes_])
7979
assert_type(np.char.lstrip(AR_T), AR_T_alias)
80-
assert_type(np.char.lstrip(AR_T, "_"), AR_T_alias)
80+
assert_type(np.char.lstrip(AR_T, "_"), AR_TU_alias)
8181

8282
assert_type(np.char.rstrip(AR_U), npt.NDArray[np.str_])
8383
assert_type(np.char.rstrip(AR_S, b"_"), npt.NDArray[np.bytes_])
8484
assert_type(np.char.rstrip(AR_T), AR_T_alias)
85-
assert_type(np.char.rstrip(AR_T, "_"), AR_T_alias)
85+
assert_type(np.char.rstrip(AR_T, "_"), AR_TU_alias)
8686

8787
assert_type(np.char.strip(AR_U), npt.NDArray[np.str_])
8888
assert_type(np.char.strip(AR_S, b"_"), npt.NDArray[np.bytes_])
8989
assert_type(np.char.strip(AR_T), AR_T_alias)
90-
assert_type(np.char.strip(AR_T, "_"), AR_T_alias)
90+
assert_type(np.char.strip(AR_T, "_"), AR_TU_alias)
9191

9292
assert_type(np.char.count(AR_U, "a", start=[1, 2, 3]), npt.NDArray[np.int_])
9393
assert_type(np.char.count(AR_S, [b"a", b"b", b"c"], end=9), npt.NDArray[np.int_])
9494
assert_type(np.char.count(AR_T, AR_T, start=[1, 2, 3]), npt.NDArray[np.int_])
95-
assert_type(np.strings.count(AR_T, ["a", "b", "c"], end=9), npt.NDArray[np.int_])
95+
assert_type(np.char.count(AR_T, ["a", "b", "c"], end=9), npt.NDArray[np.int_])
9696

9797
assert_type(np.char.partition(AR_U, "\n"), npt.NDArray[np.str_])
9898
assert_type(np.char.partition(AR_S, [b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
99-
assert_type(np.char.partition(AR_T, "\n"), AR_T_alias)
99+
assert_type(np.char.partition(AR_T, "\n"), AR_TU_alias)
100100

101101
assert_type(np.char.rpartition(AR_U, "\n"), npt.NDArray[np.str_])
102102
assert_type(np.char.rpartition(AR_S, [b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
103-
assert_type(np.char.rpartition(AR_T, "\n"), AR_T_alias)
103+
assert_type(np.char.rpartition(AR_T, "\n"), AR_TU_alias)
104104

105105
assert_type(np.char.replace(AR_U, "_", "-"), npt.NDArray[np.str_])
106106
assert_type(np.char.replace(AR_S, [b"_", b""], [b"a", b"b"]), npt.NDArray[np.bytes_])
107-
assert_type(np.char.replace(AR_T, "_", "_"), AR_T_alias)
107+
assert_type(np.char.replace(AR_T, "_", "_"), AR_TU_alias)
108108

109109
assert_type(np.char.split(AR_U, "_"), npt.NDArray[np.object_])
110110
assert_type(np.char.split(AR_S, maxsplit=[1, 2, 3]), npt.NDArray[np.object_])

‎numpy/typing/tests/data/reveal/strings.pyi

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ AR_S: npt.NDArray[np.bytes_]
1010
AR_T: np.ndarray[np_t._Shape, np.dtypes.StringDType]
1111

1212
AR_T_alias: TypeAlias = np.ndarray[np_t._Shape, np.dtypes.StringDType]
13+
AR_TU_alias: TypeAlias = AR_T_alias | npt.NDArray[np.str_]
1314

1415
assert_type(np.strings.equal(AR_U, AR_U), npt.NDArray[np.bool])
1516
assert_type(np.strings.equal(AR_S, AR_S), npt.NDArray[np.bool])
@@ -54,7 +55,6 @@ assert_type(np.strings.capitalize(AR_T), AR_T_alias)
5455
assert_type(np.strings.center(AR_U, 5), npt.NDArray[np.str_])
5556
assert_type(np.strings.center(AR_S, [2, 3, 4], b"a"), npt.NDArray[np.bytes_])
5657
assert_type(np.strings.center(AR_T, 5), AR_T_alias)
57-
assert_type(np.strings.center(AR_T, [2, 3, 4], "a"), AR_T_alias)
5858

5959
assert_type(np.strings.encode(AR_U), npt.NDArray[np.bytes_])
6060
assert_type(np.strings.encode(AR_T), npt.NDArray[np.bytes_])
@@ -67,26 +67,27 @@ assert_type(np.strings.expandtabs(AR_T), AR_T_alias)
6767
assert_type(np.strings.ljust(AR_U, 5), npt.NDArray[np.str_])
6868
assert_type(np.strings.ljust(AR_S, [4, 3, 1], fillchar=[b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
6969
assert_type(np.strings.ljust(AR_T, 5), AR_T_alias)
70-
assert_type(np.strings.ljust(AR_T, [4, 2, 1], fillchar=["a", "b", "c"]), AR_T_alias)
70+
assert_type(np.strings.ljust(AR_T, [4, 2, 1], fillchar=["a", "b", "c"]), AR_TU_alias)
7171

7272
assert_type(np.strings.rjust(AR_U, 5), npt.NDArray[np.str_])
7373
assert_type(np.strings.rjust(AR_S, [4, 3, 1], fillchar=[b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
7474
assert_type(np.strings.rjust(AR_T, 5), AR_T_alias)
75+
assert_type(np.strings.rjust(AR_T, [4, 2, 1], fillchar=["a", "b", "c"]), AR_TU_alias)
7576

7677
assert_type(np.strings.lstrip(AR_U), npt.NDArray[np.str_])
7778
assert_type(np.strings.lstrip(AR_S, b"_"), npt.NDArray[np.bytes_])
7879
assert_type(np.strings.lstrip(AR_T), AR_T_alias)
79-
assert_type(np.strings.lstrip(AR_T, "_"), AR_T_alias)
80+
assert_type(np.strings.lstrip(AR_T, "_"), AR_TU_alias)
8081

8182
assert_type(np.strings.rstrip(AR_U), npt.NDArray[np.str_])
8283
assert_type(np.strings.rstrip(AR_S, b"_"), npt.NDArray[np.bytes_])
8384
assert_type(np.strings.rstrip(AR_T), AR_T_alias)
84-
assert_type(np.strings.rstrip(AR_T, "_"), AR_T_alias)
85+
assert_type(np.strings.rstrip(AR_T, "_"), AR_TU_alias)
8586

8687
assert_type(np.strings.strip(AR_U), npt.NDArray[np.str_])
8788
assert_type(np.strings.strip(AR_S, b"_"), npt.NDArray[np.bytes_])
8889
assert_type(np.strings.strip(AR_T), AR_T_alias)
89-
assert_type(np.strings.strip(AR_T, "_"), AR_T_alias)
90+
assert_type(np.strings.strip(AR_T, "_"), AR_TU_alias)
9091

9192
assert_type(np.strings.count(AR_U, "a", start=[1, 2, 3]), npt.NDArray[np.int_])
9293
assert_type(np.strings.count(AR_S, [b"a", b"b", b"c"], end=9), npt.NDArray[np.int_])
@@ -95,15 +96,15 @@ assert_type(np.strings.count(AR_T, ["a", "b", "c"], end=9), npt.NDArray[np.int_]
9596

9697
assert_type(np.strings.partition(AR_U, "\n"), npt.NDArray[np.str_])
9798
assert_type(np.strings.partition(AR_S, [b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
98-
assert_type(np.strings.partition(AR_T, "\n"), AR_T_alias)
99+
assert_type(np.strings.partition(AR_T, "\n"), AR_TU_alias)
99100

100101
assert_type(np.strings.rpartition(AR_U, "\n"), npt.NDArray[np.str_])
101102
assert_type(np.strings.rpartition(AR_S, [b"a", b"b", b"c"]), npt.NDArray[np.bytes_])
102-
assert_type(np.strings.rpartition(AR_T, "\n"), AR_T_alias)
103+
assert_type(np.strings.rpartition(AR_T, "\n"), AR_TU_alias)
103104

104105
assert_type(np.strings.replace(AR_U, "_", "-"), npt.NDArray[np.str_])
105106
assert_type(np.strings.replace(AR_S, [b"_", b""], [b"a", b"b"]), npt.NDArray[np.bytes_])
106-
assert_type(np.strings.replace(AR_T, "_", "_"), AR_T_alias)
107+
assert_type(np.strings.replace(AR_T, "_", "_"), AR_TU_alias)
107108

108109
assert_type(np.strings.lower(AR_U), npt.NDArray[np.str_])
109110
assert_type(np.strings.lower(AR_S), npt.NDArray[np.bytes_])

0 commit comments

Comments
 (0)