-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
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.
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
Bugfix for multilevel columns with empty strings in Python 2 #17099
Merged
jreback
merged 6 commits into
pandas-dev:master
from
chrisjbillington:getitem-multilevel-bugfix
Aug 10, 2017
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e54c734
Allow unicode empty strings to be used as placeholders in multilevel …
chrisjbillington a798b70
added test for unicode multilevel column placeholders
chrisjbillington 63071bd
Added whatsnew note, modfied tests for mixed level columns based on p…
chrisjbillington e7c9f97
Dedup test, added descriptive comment to _getitem_multilevel().
chrisjbillington b419cb6
merge
chrisjbillington f1edf68
parametrize test, simplified whatnew note
chrisjbillington 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
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1675,24 +1675,31 @@ def test_int_series_slicing(self): | |
expected = self.ymd.reindex(s.index[5:]) | ||
tm.assert_frame_equal(result, expected) | ||
|
||
def test_mixed_depth_get(self): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use
|
||
@pytest.mark.parametrize('unicode_strings', [True, False]) | ||
def test_mixed_depth_get(self, unicode_strings): | ||
# If unicode_strings is True, the column labels in dataframe | ||
# construction will use unicode strings in Python 2 (pull request | ||
# #17099). | ||
|
||
arrays = [['a', 'top', 'top', 'routine1', 'routine1', 'routine2'], | ||
['', 'OD', 'OD', 'result1', 'result2', 'result1'], | ||
['', 'wx', 'wy', '', '', '']] | ||
|
||
if unicode_strings: | ||
arrays = [[u(s) for s in arr] for arr in arrays] | ||
|
||
tuples = sorted(zip(*arrays)) | ||
index = MultiIndex.from_tuples(tuples) | ||
df = DataFrame(randn(4, 6), columns=index) | ||
df = DataFrame(np.random.randn(4, 6), columns=index) | ||
|
||
result = df['a'] | ||
expected = df['a', '', ''] | ||
tm.assert_series_equal(result, expected, check_names=False) | ||
assert result.name == 'a' | ||
expected = df['a', '', ''].rename('a') | ||
tm.assert_series_equal(result, expected) | ||
|
||
result = df['routine1', 'result1'] | ||
expected = df['routine1', 'result1', ''] | ||
tm.assert_series_equal(result, expected, check_names=False) | ||
assert result.name == ('routine1', 'result1') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you parametrize |
||
expected = expected.rename(('routine1', 'result1')) | ||
tm.assert_series_equal(result, expected) | ||
|
||
def test_mixed_depth_insert(self): | ||
arrays = [['a', 'top', 'top', 'routine1', 'routine1', 'routine2'], | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
put a comment what is going on here.