Skip to content

Commit b47951a

Browse files
committed
Iterable -> Iterable[Any], extra test cases
1 parent ee06333 commit b47951a

File tree

6 files changed

+12
-3
lines changed

6 files changed

+12
-3
lines changed

pandas-stubs/core/frame.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
17841784
copy: _bool = True,
17851785
) -> Self: ...
17861786
def isin(
1787-
self, values: Iterable | DataFrame | Mapping[Hashable, Iterable]
1787+
self, values: Iterable[Any] | Mapping[Hashable, Iterable[Any]] | DataFrame
17881788
) -> Self: ...
17891789
@property
17901790
def plot(self) -> PlotAccessor: ...

pandas-stubs/core/indexes/base.pyi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,9 @@ class Index(IndexOpsMixin[S1], ElementOpsMixin[S1]):
554554
@final
555555
def get_indexer_for(self, target, **kwargs: Any): ...
556556
def map(self, mapper, na_action=...) -> Index: ...
557-
def isin(self, values: Iterable, level: Level | None = None) -> np_1darray_bool: ...
557+
def isin(
558+
self, values: Iterable[Any], level: Level | None = None
559+
) -> np_1darray_bool: ...
558560
def slice_indexer(
559561
self,
560562
start: Label | None = None,

pandas-stubs/core/series.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1302,7 +1302,7 @@ class Series(IndexOpsMixin[S1], ElementOpsMixin[S1], NDFrame):
13021302
show_counts: bool | None = ...,
13031303
) -> None: ...
13041304
def memory_usage(self, index: _bool = True, deep: _bool = False) -> int: ...
1305-
def isin(self, values: Iterable) -> Series[_bool]: ...
1305+
def isin(self, values: Iterable[Any]) -> Series[_bool]: ...
13061306
def between(
13071307
self,
13081308
left: Scalar | ListLikeU,

tests/indexes/test_indexes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ def test_index_isin() -> None:
6060
check(assert_type(ind.isin({2, 4}), np_1darray_bool), np_1darray_bool)
6161
check(assert_type(ind.isin(pd.Series([2, 4])), np_1darray_bool), np_1darray_bool)
6262
check(assert_type(ind.isin(pd.Index([2, 4])), np_1darray_bool), np_1darray_bool)
63+
check(assert_type(ind.isin(iter([2, "4"])), np_1darray_bool), np_1darray_bool)
6364

6465

6566
def test_index_astype() -> None:

tests/series/test_series.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,6 +1618,7 @@ def test_series_isin() -> None:
16181618
assert_type(s.isin(pd.Series([3, 4])), "pd.Series[bool]"), pd.Series, np.bool_
16191619
)
16201620
check(assert_type(s.isin(pd.Index([3, 4])), "pd.Series[bool]"), pd.Series, np.bool_)
1621+
check(assert_type(s.isin(iter([3, "4"])), "pd.Series[bool]"), pd.Series, np.bool_)
16211622

16221623

16231624
def test_series_index_isin() -> None:

tests/test_frame.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from collections import (
44
OrderedDict,
5+
UserDict,
56
UserList,
67
defaultdict,
78
deque,
@@ -2948,6 +2949,10 @@ def test_frame_isin() -> None:
29482949
check(assert_type(df.isin(pd.Index([1, 3, 5])), pd.DataFrame), pd.DataFrame)
29492950
check(assert_type(df.isin(df), pd.DataFrame), pd.DataFrame)
29502951
check(assert_type(df.isin({"x": [1, 2]}), pd.DataFrame), pd.DataFrame)
2952+
check(
2953+
assert_type(df.isin(UserDict({"x": iter([1, "2"])})), pd.DataFrame),
2954+
pd.DataFrame,
2955+
)
29512956

29522957

29532958
def test_frame_getitem_isin() -> None:

0 commit comments

Comments
 (0)