Merge pull request #15 from Dr-Irv/hashablegetitem

fix issues with Index.__getitem__

Author: Dr-Irv

tests/pandas/test_indexes.py

@@ -40,3 +40,22 @@ def test_index_tolist() -> None:
     i1 = pd.Index([1, 2, 3])
     l1 = i1.tolist()
     i2 = i1.to_list()
+
+
+def test_column_getitem() -> None:
+    # https://github.com/microsoft/python-type-stubs/issues/199#issuecomment-1132806594
+    df = pd.DataFrame([[1, 2, 3]], columns=["a", "b", "c"])
+
+    column = df.columns[0]
+    a = df[column]
+    
+def test_column_contains() -> None:
+    # https://github.com/microsoft/python-type-stubs/issues/199
+    df = pd.DataFrame({'A': [1, 2], 'B': ['c', 'd'], 'E': [3, 4]})
+
+    collist = [column for column in df.columns]
+ 
+    collist2 = [column for column in df.columns[df.columns.str.contains('A|B')]]
+
+    length = len(df.columns[df.columns.str.contains('A|B')])
+    

typings/pandas/core/frame.pyi

@@ -356,7 +356,7 @@ class DataFrame(NDFrame, OpsMixin):
             Series[_bool],
             DataFrame,
             List[_str],
-            List[Hashable],
+            List[Scalar],
             Index,
             np_ndarray_str,
             np_ndarray_bool,

typings/pandas/core/indexes/base.pyi

@@ -174,11 +174,11 @@ class Index(IndexOpsMixin, PandasObject):
     def __hash__(self) -> int: ...
     def __setitem__(self, key, value) -> None: ...
     @overload
-    def __getitem__(self, idx: Union[slice, np_ndarray_int64, Index]) -> Index: ...
+    def __getitem__(self, idx: Union[slice, np_ndarray_int64, Index, Series[bool]]) -> Index: ...
     @overload
     def __getitem__(
         self, idx: Union[int, Tuple[np_ndarray_int64, ...]]
-    ) -> Hashable: ...
+    ) -> Scalar: ...
     def append(self, other): ...
     def putmask(self, mask, value): ...
     def equals(self, other) -> bool: ...