BUG: Add logical operators to pd.col Expression class #63330
Merged
+90
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add __and__, __rand__, __or__, __ror__, __xor__, __rxor__, __invert__ methods to Expression class to support combining conditions with &, |, ^, ~ operators in pd.col expressions. Closes pandas-dev#63322
rhshadrach
requested changes
Dec 11, 2025
Member
rhshadrach
left a comment
rhshadrach
left a comment
There was a problem hiding this comment.
Thanks for the PR! Can you add tests.
Add comprehensive tests for the new logical operators (__and__, __or__, __xor__, __invert__) in the Expression class: - test_col_logical_ops: Parametrized tests for &, |, ^, ~ operators with both column-to-column and column-to-scalar operations - test_col_logical_ops_combined: Integration test demonstrating real-world usage in DataFrame.loc[] with combined conditions 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
rhshadrach
requested changes
Dec 13, 2025
pandas/tests/test_col.py
Outdated
Comment on lines
105
to
107
| # __and__ and __rand__ | ||
| # a = [True, False, True, False], b = [False, True, True, True] | ||
| # a & b = [False, False, True, False] |
Member
There was a problem hiding this comment.
Can you remove the comments throughout the parametrization.
pandas/tests/test_col.py
Outdated
| ], | ||
| ) | ||
| def test_col_logical_ops( | ||
| expr: Expression, expected_values: list[object], expected_str: str |
pandas/tests/test_col.py
Outdated
| assert str(expr) == expected_str | ||
|
|
||
|
|
||
| def test_col_logical_ops_combined() -> None: |
Member
There was a problem hiding this comment.
Instead of this, can you test loc in the test above? I believe it'd just be:
result = df.loc[expr]
expected = df[expected_values]
tm.assert_frame_equal(result, expected)- Remove inline comments from parametrized test cases - Change type annotation from list[object] to list[bool] - Remove test_col_logical_ops_combined and add .loc testing to the main parametrized test function 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>
rhshadrach
requested changes
Dec 13, 2025
Comment on lines
144
to
145
| ) -> None: | ||
| df = pd.DataFrame({"a": [True, False, True, False], "b": [False, True, True, True]}) |
Member
There was a problem hiding this comment.
Suggested change
| ) -> None: | |
| df = pd.DataFrame({"a": [True, False, True, False], "b": [False, True, True, True]}) | |
| ) -> None: | |
| # https://github.com/pandas-dev/pandas/issues/63322 | |
| df = pd.DataFrame({"a": [True, False, True, False], "b": [False, True, True, True]}) |
Contributor
Author
|
@rhshadrach All feedback has been addressed. Could you please re-review? Thanks! |
rhshadrach
added
Bug
expressions
Member
|
Thanks @majiayu000! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Add
__and__,__rand__,__or__,__ror__,__xor__,__rxor__,__invert__methods toExpressionclass to support combining conditions with&,|,^,~operators inpd.colexpressions.Example
Closes #63322