Skip to content

BUG: DataFrame.merge(suffixes=) does not respect None #24819

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 11 commits into from
Feb 6, 2019
Merged

BUG: DataFrame.merge(suffixes=) does not respect None #24819

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
82c52a4
one in all
charlesdong1991 Feb 2, 2019
dd605e0
change whatsnew to 0.25
charlesdong1991 Feb 2, 2019
af7f9ad
add back other comment
charlesdong1991 Feb 2, 2019
4d5e1a9
double check test
charlesdong1991 Feb 2, 2019
3f65bf1
changes based on discussion
charlesdong1991 Feb 2, 2019
ce7e4b8
changes based on discussion with joris
charlesdong1991 Feb 3, 2019
90ca9cd
slight change
charlesdong1991 Feb 3, 2019
e995a04
slight changes
charlesdong1991 Feb 4, 2019
9c3dfbd
changes based on jeff review
charlesdong1991 Feb 4, 2019
441e9a5
fix test error
charlesdong1991 Feb 4, 2019
71729b2
ci fail, try again
charlesdong1991 Feb 4, 2019
File filter

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
fix test error
  • Loading branch information
@charlesdong1991
charlesdong1991 committed Feb 4, 2019
commit 441e9a519a63d59f541d79500ed353792d2c486b
2 changes: 1 addition & 1 deletion pandas/tests/reshape/merge/test_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,6 +1585,6 @@ def test_merge_suffix_none_error(col1, col2, suffixes):
b = pd.DataFrame({col2: [3, 4, 5]})

# TODO: might reconsider current raise behaviour, see issue 24782
msg = "'NoneType' object is not iterable"
msg = "iterable"
with pytest.raises(TypeError, match=msg):
pd.merge(a, b, left_index=True, right_index=True, suffixes=suffixes)