*: Automated changes from pyupgrade #3403
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
This was only necessary in python 3. This change was made with a version of pyupgrade that was modified to perform only this change.
These features have been available since Python 2.7. This change was made with a version of pyupgrade modified to perform only this change, then postprocessed with black.
Another feature that's been around since Python 2.7 Automated change with modified pyupgrade and black.
Various errors were merged into OSError in Python 3.4. Automated change with modified pyupgrade.
I had missed that this became hard-coded to utf-8 in py3k, instead of being overridable as in python 2. Automated change with modified pyupgrade.
This alias existed only for python 2 compatibility. This commit was partially made by pyupgrade and then I manually fixed the unused import.
- Unpack list comprehension - Redundant calls to str() on string literals - Unnecessary args to super() With the previous commits, this brings us up to pyupgrade --py3-plus --keep-percent-format
This makes black use trailing commas consistently across the codebase. Without this, it uses certain trailing commas only in files that contain fstrings (because this marks them as requiring Python 3.6+).
Automated change using pyupgrade in two passes (once to go from percent formatting to str.format, then to go from str.format to f-strings), followed by black. This left a few uses of str.format for unknown reasons.
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.
Adopt various new language features throughout the codebase. These changes are all automated by pyupgrade, but I had to modify pyupgrade to disable a change that was incorrect (it wanted to remove a call to
str.encodewhich was used for its side effect to avoid import deadlocks), and to split things up into multiple commits for easier review. The last commit, which converts to fstrings, required running pyupgrade in two passes.Closes #3391