8000 CLN/ERR: str.cat internals by h-vetinari · Pull Request #22725 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

CLN/ERR: str.cat internals #22725

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 9 commits into from
Oct 14, 2018
Merged

CLN/ERR: str.cat internals #22725

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f8890c
CLN: str.cat internals
h-vetinari Sep 5, 2018
285a1f7
Review (jreback)
h-vetinari Sep 23, 2018
28e7859
Refactor interleave_sep to use np.sum
h-vetinari Sep 23, 2018
807f18e
Lint; more consistent naming for masks
h-vetinari Sep 23, 2018
ed27c66
Add comment
h-vetinari Sep 23, 2018
0d3c6d2
Review (WillAyd)
h-vetinari Oct 8, 2018
36c6240
Review (WillAyd)
h-vetinari Oct 9, 2018
a97fe67
Add np-compat
h-vetinari Oct 10, 2018
e58ec9d
Revert using more idiomatic code due to perf
h-vetinari Oct 12, 2018
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
Prev Previous commit
Next Next commit
Review (WillAyd)
  • Loading branch information
@h-vetinari
h-vetinari committed Oct 11, 2018
commit 0d3c6d21ed9f262acd712072a4bcde12329b51df
3 changes: 0 additions & 3 deletions pandas/core/strings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ def cat_core(list_of_columns, sep):
nd.array
The concatenation of list_of_columns with sep
"""
if sep == '':
# no need to add empty strings
return np.sum(list_of_columns, axis=0)
list_with_sep = [sep] * (2 * len(list_of_columns) - 1)
list_with_sep[::2] = list_of_columns
return np.sum(list_with_sep, axis=0)
Expand Down
8 changes: 7 additions & 1 deletion pandas/tests/test_strings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,12 @@ def test_str_cat_align_mixed_inputs(self, join):
with tm.assert_raises_regex(ValueError, rgx):
s.str.cat([t, z], join=join)

def test_str_cat_raises(self):
# non-strings hiding behind object dtype
s = Series([1, 2, 3, 4], dtype='object')
with tm.assert_raises_regex(TypeError, "unsupported operand type.*"):
s.str.cat(s)

def test_str_cat_special_cases(self):
s = Series(['a', 'b', 'c', 'd'])
t = Series(['d', 'a', 'e', 'b'], index=[3, 0, 4, 1])
Expand Down Expand Up @@ -3089,7 +3095,7 @@ def test_method_on_bytes(self):
lhs = Series(np.array(list('abc'), 'S1').astype(object))
rhs = Series(np.array(list('def'), 'S1').astype(object))
if compat.PY3:
pytest.raises(TypeError, lhs.str.cat, rhs, sep=',')
pytest.raises(TypeError, lhs.str.cat, rhs)
else:
result = lhs.str.cat(rhs)
expected = Series(np.array(
Expand Down
0