Skip to content

BUG: allow use of both default+input resolvers in df.eval, GH34966 #45134

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 8 commits into from
Jan 4, 2022
+16 −6
Merged

BUG: allow use of both default+input resolvers in df.eval, GH34966 #45134

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0351a37
BUG: default+input resolvers in df.eval, GH34966
bubblingoak Dec 30, 2021
fd51742
Add whatsnew entry
bubblingoak Dec 30, 2021
d8d1496
TST: dataframe.eval input resolvers test
bubblingoak Dec 30, 2021
17d70a8
CLN: black formatting and assert_series_equal not frame
bubblingoak Dec 30, 2021
13dc642
Fix typo
bubblingoak Dec 30, 2021
f3dd3fd
TST: Minor fix to test_eval_resolvers_combined
bubblingoak Dec 30, 2021
c276d97
DOC: Add issue number to whatsnew entry
bubblingoak Jan 3, 2022
57e163b
Merge branch 'pandas-dev:master' into fix-df-eval-resolvers
bubblingoak Jan 4, 2022
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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.4.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,7 @@ Other
- Bug in :meth:`DataFrame.diff` when passing a NumPy integer object instead of an ``int`` object (:issue:`44572`)
- Bug in :meth:`Series.replace` raising ``ValueError`` when using ``regex=True`` with a :class:`Series` containing ``np.nan`` values (:issue:`43344`)
- Bug in :meth:`DataFrame.to_records` where an incorrect ``n`` was used when missing names were replaced by ``level_n`` (:issue:`44818`)
- Bug in :meth:`DataFrame.eval` where ``resolvers`` argument was overriding the default resolvers

.. ***DO NOT USE THIS SECTION***

Expand Down
10 changes: 4 additions & 6 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4221,15 +4221,13 @@ def eval(self, expr: str, inplace: bool = False, **kwargs):
from pandas.core.computation.eval import eval as _eval

inplace = validate_bool_kwarg(inplace, "inplace")
resolvers = kwargs.pop("resolvers", None)
kwargs["level"] = kwargs.pop("level", 0) + 1
if resolvers is None:
index_resolvers = self._get_index_resolvers()
column_resolvers = self._get_cleaned_column_resolvers()
resolvers = column_resolvers, index_resolvers
index_resolvers = self._get_index_resolvers()
column_resolvers = self._get_cleaned_column_resolvers()
resolvers = column_resolvers, index_resolvers
if "target" not in kwargs:
kwargs["target"] = self
kwargs["resolvers"] = kwargs.get("resolvers", ()) + tuple(resolvers)
kwargs["resolvers"] = tuple(kwargs.get("resolvers", ())) + resolvers

return _eval(expr, inplace=inplace, **kwargs)

Expand Down