-
Notifications
You must be signed in to change notification settings - Fork 1.6k
[flake8-simplify] Fix truthiness assumption for non-iterable arguments in tuple/list/set calls (SIM222, SIM223)
#21479
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
danparizher
wants to merge
7
commits into
astral-sh:main
Choose a base branch
from
danparizher:fix-21473
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+41
−19
Open
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
216645d
fix-21473
danparizher 0ee00ed
Update ruff_linter__rules__flake8_pytest_style__tests__PT015.snap
danparizher 2cc5cb7
Update analyze_graph.rs
danparizher d1987b2
Revert "Update analyze_graph.rs"
danparizher 392858c
Update truthiness checks to include t-strings and f-strings
danparizher a3d00c1
Explicitly handle various expression types
danparizher c4041b4
Consolidate logic
danparizher File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1212,6 +1212,19 @@ pub enum Truthiness { | |
| Unknown, | ||
| } | ||
|
|
||
| /// Return `true` if the expression is definitely not iterable (e.g., numbers, booleans, None). | ||
| /// This is used to avoid incorrectly assuming truthiness for `tuple(x)`, `list(x)`, etc. | ||
| /// when `x` is not iterable. | ||
| fn is_definitely_not_iterable(expr: &Expr) -> bool { | ||
| matches!( | ||
| expr, | ||
| Expr::NumberLiteral(_) | ||
| | Expr::BooleanLiteral(_) | ||
| | Expr::NoneLiteral(_) | ||
| | Expr::EllipsisLiteral(_) | ||
| ) | ||
| } | ||
|
|
||
| impl Truthiness { | ||
| /// Return the truthiness of an expression. | ||
| pub fn from_expr<F>(expr: &Expr, is_builtin: F) -> Self | ||
|
|
@@ -1328,6 +1341,19 @@ impl Truthiness { | |
| // recursing into Self::from_expr below, which returns Unknown for them. | ||
| if argument.is_generator_expr() { | ||
| Self::Unknown | ||
| } else if is_definitely_not_iterable(argument) { | ||
| // For non-iterable arguments like numbers, booleans, None, etc., | ||
| // we can't assume truthiness. For example, tuple(0) raises TypeError. | ||
| Self::Unknown | ||
ntBre marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } else if matches!(argument, Expr::StringLiteral(_)) { | ||
| // For strings, tuple("") creates an empty tuple which is falsy, | ||
| // but tuple("a") creates a non-empty tuple which is truthy. | ||
| // However, we can't assume truthiness matches because: | ||
| // - tuple("") is falsy (empty tuple), but "" is also falsy | ||
| // - The issue is that we conflate truthiness with non-emptiness | ||
| // - For SIM222/SIM223, we should be conservative and return Unknown | ||
| // to avoid false positives | ||
| Self::Unknown | ||
|
||
| } else { | ||
| Self::from_expr(argument, is_builtin) | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.