Gate PEP604 isinstance rewrites behind Python 3.10+ #3327
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
charliermarsh
commented
Mar 3, 2023
| @@ -2631,7 +2631,10 @@ where | |||
| if self.settings.rules.enabled(&Rule::OSErrorAlias) { | |||
| pyupgrade::rules::os_error_alias(self, &expr); | |||
| } | |||
| if self.settings.rules.enabled(&Rule::IsinstanceWithTuple) { | |||
| if self.settings.rules.enabled(&Rule::IsinstanceWithTuple) | |||
| && !self.settings.pyupgrade.keep_runtime_typing | |||
There was a problem hiding this comment.
This flag is redundant, but it's already redundant for the other PEP 604 rule (since it's equivalent to turning off the rule), so I think it makes sense to be consistent.
charliermarsh
force-pushed
the
charlie/gate
branch
from
e05c08d to
9f49431
Compare
andersk
reviewed
Mar 3, 2023
Comment on lines
26
to
31
| /// `from __future__ import annotations`. Note that this setting is only | ||
| /// applicable when the target Python version is below 3.9 and 3.10 | ||
| /// respectively, and enabling it is equivalent to disabling | ||
| /// `use-pep585-annotation` (`UP006`) and `use-pep604-annotation` | ||
| /// (`UP007`) entirely. | ||
| /// `use-pep585-annotation` (`UP006`), `use-pep604-annotation` | ||
| /// (`UP007`), and `use-pep604-isinstance` (`UP038`) entirely. | ||
| pub keep_runtime_typing: Option<bool>, |
There was a problem hiding this comment.
An isinstance call is not an annotation, isn’t affected by from __future__ import annotations, and isn’t visible to typing.get_type_hints (the upstream motivation for this flag: asottile/pyupgrade#387), so I’m not sure the same logic applies.
There was a problem hiding this comment.
Don't feel strongly! I thought it could feel inconsistent or surprising to users but your argument makes sense.
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.
Closes #3326.