CLN: Assorted cleanups #27094
Merged
CLN: Assorted cleanups #27094
Conversation
This file contains hidden or 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
jbrockmendel
commented
Jun 28, 2019
| @@ -262,6 +262,7 @@ def test_bad_url_protocol(self): | |||
| self.read_html('git://github.com', match='.*Water.*') | |||
|
|
|||
| @network | |||
| @pytest.mark.slow | |||
| def test_invalid_url(self): | |||
There was a problem hiding this comment.
two versions of this test get run and each take 150s locally
jreback
approved these changes
Jun 28, 2019
| @@ -1809,3 +1809,44 @@ def validate_operand(obj): | |||
| else: | |||
| raise TypeError('Can only merge Series or DataFrame objects, ' | |||
| 'a {obj} was passed'.format(obj=type(obj))) | |||
|
|
|||
|
|
|||
| def _items_overlap_with_suffix(left, lsuffix, right, rsuffix): | |||
There was a problem hiding this comment.
can be a later PR, can you type these args
pandas/core/reshape/merge.py
Outdated
| to_rename = left.intersection(right) | ||
| if len(to_rename) == 0: | ||
| return left, right | ||
| else: |
There was a problem hiding this comment.
don't need the else here (just dedent)
|
thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.