Use general OSError and more Python3 defaults from pyupgrade #19241
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
timhoffm
reviewed
Jan 5, 2021
versioneer.py
Outdated
| @@ -339,7 +339,6 @@ | |||
|
|
|||
| """ | |||
|
|
|||
| from __future__ import print_function | |||
There was a problem hiding this comment.
Please don't change anything in versioneer.py. It's a vendored file from (https://github.com/python-versioneer/python-versioneer) with slight modifications. Additional local changes make it harder to pull in changes from the upstream version.
There was a problem hiding this comment.
Thank you @timhoffm . I have removed versioneer.py from my PR entirely.
According to PEP 3151, OSError can be used for all system-related exceptions and thus replace IOError, EnvironmentError, socket.error, etc.
QuLogic
reviewed
Jan 5, 2021
| @@ -71,7 +71,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): | |||
| stderr=(subprocess.PIPE if hide_stderr | |||
| else None)) | |||
| break | |||
| except EnvironmentError: | |||
| except OSError: | |||
There was a problem hiding this comment.
I would not bother changing this file either as it will be deleted by #18971 .
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.
PR Summary
Running
pyupgrade --py3-plusand ignoring all string updates (percent/format/f) to use defaults introduced in Python3.PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).