type isin, remove redundant Iterable | Series

Author: MarcoGorelli

pandas-stubs/core/frame.pyi

@@ -1783,7 +1783,9 @@ class DataFrame(NDFrame, OpsMixin, _GetItemHack):
         axis: Axis = 0,
         copy: _bool = True,
     ) -> Self: ...
-    def isin(self, values: Iterable | Series | DataFrame | dict) -> Self: ...
+    def isin(
+        self, values: Iterable | DataFrame | Mapping[Hashable, Iterable]
+    ) -> Self: ...
     @property
     def plot(self) -> PlotAccessor: ...
     def hist(

pandas-stubs/core/indexes/base.pyi

@@ -554,7 +554,7 @@ class Index(IndexOpsMixin[S1], ElementOpsMixin[S1]):
     @final
     def get_indexer_for(self, target, **kwargs: Any): ...
     def map(self, mapper, na_action=...) -> Index: ...
-    def isin(self, values, level=...) -> np_1darray_bool: ...
+    def isin(self, values: Iterable, level: Level | None = None) -> np_1darray_bool: ...
     def slice_indexer(
         self,
         start: Label | None = None,

pandas-stubs/core/series.pyi

@@ -1302,7 +1302,7 @@ class Series(IndexOpsMixin[S1], ElementOpsMixin[S1], NDFrame):
         show_counts: bool | None = ...,
     ) -> None: ...
     def memory_usage(self, index: _bool = True, deep: _bool = False) -> int: ...
-    def isin(self, values: Iterable | Series[S1] | dict) -> Series[_bool]: ...
+    def isin(self, values: Iterable) -> Series[_bool]: ...
     def between(
         self,
         left: Scalar | ListLikeU,

tests/indexes/test_indexes.py

@@ -56,8 +56,10 @@ def test_index_duplicated() -> None:
 
 def test_index_isin() -> None:
     ind = pd.Index([1, 2, 3, 4, 5])
-    isin = ind.isin([2, 4])
-    check(assert_type(isin, np_1darray_bool), np_1darray_bool)
+    check(assert_type(ind.isin([2, 4]), np_1darray_bool), np_1darray_bool)
+    check(assert_type(ind.isin({2, 4}), np_1darray_bool), np_1darray_bool)
+    check(assert_type(ind.isin(pd.Series([2, 4])), np_1darray_bool), np_1darray_bool)
+    check(assert_type(ind.isin(pd.Index([2, 4])), np_1darray_bool), np_1darray_bool)
 
 
 def test_index_astype() -> None:

tests/series/test_series.py

@@ -1610,6 +1610,16 @@ def test_series_min_max_sub_axis() -> None:
     check(assert_type(df.max(axis=1), pd.Series), pd.Series)
 
 
+def test_series_isin() -> None:
+    s = pd.Series([1, 2, 3, 4, 5])
+    check(assert_type(s.isin([3, 4]), "pd.Series[bool]"), pd.Series, np.bool_)
+    check(assert_type(s.isin({3, 4}), "pd.Series[bool]"), pd.Series, np.bool_)
+    check(
+        assert_type(s.isin(pd.Series([3, 4])), "pd.Series[bool]"), pd.Series, np.bool_
+    )
+    check(assert_type(s.isin(pd.Index([3, 4])), "pd.Series[bool]"), pd.Series, np.bool_)
+
+
 def test_series_index_isin() -> None:
     s = pd.Series([1, 2, 3, 4, 5], index=[1, 2, 2, 3, 3])
     t1 = s.loc[s.index.isin([1, 3])]

tests/test_frame.py

@@ -2940,6 +2940,16 @@ def test_getmultiindex_columns() -> None:
     check(assert_type(df[li[0]], pd.Series), pd.Series)
 
 
+def test_frame_isin() -> None:
+    df = pd.DataFrame({"x": [1, 2, 3, 4, 5]}, index=[1, 2, 3, 4, 5])
+    check(assert_type(df.isin([1, 3, 5]), pd.DataFrame), pd.DataFrame)
+    check(assert_type(df.isin({1, 3, 5}), pd.DataFrame), pd.DataFrame)
+    check(assert_type(df.isin(pd.Series([1, 3, 5])), pd.DataFrame), pd.DataFrame)
+    check(assert_type(df.isin(pd.Index([1, 3, 5])), pd.DataFrame), pd.DataFrame)
+    check(assert_type(df.isin(df), pd.DataFrame), pd.DataFrame)
+    check(assert_type(df.isin({"x": [1, 2]}), pd.DataFrame), pd.DataFrame)
+
+
 def test_frame_getitem_isin() -> None:
     df = pd.DataFrame({"x": [1, 2, 3, 4, 5]}, index=[1, 2, 3, 4, 5])
     check(assert_type(df[df.index.isin([1, 3, 5])], pd.DataFrame), pd.DataFrame)