Skip to content
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

fix for 47734 - df.eval can't concatenate string column and string via + #60824

Closed
wants to merge 4 commits into from
+9 −1
Closed

fix for 47734 - df.eval can't concatenate string column and string via + #60824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c93e69a
fix for df.eval can't concatenate string column and string via +
dannyi96 Feb 1, 2025
3737164
47734: updates for infer string tests
dannyi96 Feb 16, 2025
1c7ce4a
47734: updates for infer string tests
dannyi96 Feb 16, 2025
f2ae048
Merge branch 'main' into concat_str
dannyi96 Feb 16, 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
3 changes: 2 additions & 1 deletion pandas/core/computation/ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from pandas.core.dtypes.common import (
is_list_like,
is_scalar,
pandas_dtype,
)

import pandas.core.common as com
Expand Down Expand Up @@ -238,7 +239,7 @@ def return_type(self):
@property
def has_invalid_return_type(self) -> bool:
types = self.operand_types
obj_dtype_set = frozenset([np.dtype("object")])
obj_dtype_set = frozenset([np.dtype("object"), str, pandas_dtype("string")])
return self.return_type == object and types - obj_dtype_set

@property
Expand Down
7 changes: 7 additions & 0 deletions pandas/tests/computation/test_eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,13 @@ def test_eval_keep_name(self, engine, parser):
expected = Series([4, 30, 56], name="a")
tm.assert_series_equal(expected, res)

def test_obj_str_addition(self):
# GH 47734
df = DataFrame({"a": ["a", "b"]})
res = df.eval("a + 'a'", engine="python")
expected = Series(["aa", "ba"], name="a")
tm.assert_series_equal(expected, res)

def test_eval_unmatching_names(self, engine, parser):
variable_name = Series([42], name="series_name")
res = pd.eval("variable_name + 0", engine=engine, parser=parser)
Expand Down
Loading