Skip to content

GH1299 Allow for Index and Series in the second argument of DataFrame.loc #1310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2025
Merged

GH1299 Allow for Index and Series in the second argument of DataFrame.loc #1310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
092e14b
GH1299 Allow for Index and Series in the second argument of DataFrame…
loicdiridollou Aug 7, 2025
3d656b2
GH1299 Formatting
loicdiridollou Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandas-stubs/core/frame.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class _LocIndexerFrame(_LocIndexer, Generic[_T]):
| slice
| _IndexSliceTuple
| Callable,
MaskType | list[HashableT] | slice | Callable,
MaskType | list[HashableT] | IndexType | Callable,
]
),
) -> _T: ...
Expand Down
16 changes: 15 additions & 1 deletion tests/test_frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ def test_types_loc_at() -> None:
df.loc[0, "col1"]



def test_types_boolean_indexing() -> None:
df = pd.DataFrame(data={"col1": [1, 2], "col2": [3, 4]})
check(assert_type(df[df > 1], pd.DataFrame), pd.DataFrame)
Expand Down Expand Up @@ -3737,13 +3738,26 @@ def test_xs_key() -> None:


def test_loc_slice() -> None:
# GH 277
"""Test DataFrame.loc with a slice, Index, Series."""
# GH277
df1 = pd.DataFrame(
{"x": [1, 2, 3, 4]},
index=pd.MultiIndex.from_product([[1, 2], ["a", "b"]], names=["num", "let"]),
)
check(assert_type(df1.loc[1, :], Union[pd.Series, pd.DataFrame]), pd.DataFrame)

# GH1299
ind = pd.Index(["a", "b"])
mask = pd.Series([True, False])
mask_col = pd.Series([True, False], index=pd.Index(["a", "b"]))
df = pd.DataFrame({"a": [1, 2], "b": [3, 4]})

# loc with index for columns
check(assert_type(df.loc[mask, ind], pd.DataFrame), pd.DataFrame)
# loc with index for columns
check(assert_type(df.loc[mask, mask_col], pd.DataFrame), pd.DataFrame)



def test_where() -> None:
df = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6]})
Expand Down
Loading