Remove stale copies of raises and approx #2607
Merged
Conversation
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
These two classes were recently moved to `python_api.py`, but it seems that they found their way back into the original file somehow. This commit removes them again to avoid out-of-date code duplication.
|
Good find, probably a merge/rebase issue |
RonnyPfannschmidt
approved these changes
Jul 22, 2017
nicoddemus
approved these changes
Jul 22, 2017
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.
raisesandapproxwere both recently moved to_pytest/python_api.py, but somehow old versions of both ended up back in_pytest/python.py. This PR removes those old versions.