Skip to content

[pyupgrade] Prevent infinite loop with I002 (UP010, UP035) #19413

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jul 31, 2025
Merged

[pyupgrade] Prevent infinite loop with I002 (UP010, UP035) #19413

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9bb09bf
fix-18729
danparizher Jul 17, 2025
d2f40c9
remove duplicate test
danparizher Jul 17, 2025
e8f7e87
extract function
danparizher Jul 28, 2025
aa8ca16
pass `StmtRef` to avoid cloning
danparizher Jul 30, 2025
ff6072d
apply test patch
ntBre Jul 30, 2025
99de943
tidy up
ntBre Jul 30, 2025
8d72fe3
use `continue` instead of return for isort required imports
danparizher Jul 31, 2025
d9768bb
avoid collecting a HashSet, check imports when needed
ntBre Jul 31, 2025
199f49f
combine tests, fix snapshot
ntBre Jul 31, 2025
4378e8e
simplify is_import_required_by_isort (?)
ntBre Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use ruff_text_size::Ranged;
use crate::checkers::ast::Checker;
use crate::fix;
use crate::{AlwaysFixableViolation, Applicability, Fix};
use ruff_python_semantic::{MemberNameImport, ModuleNameImport, NameImport};

/// ## What it does
/// Checks for unnecessary `__future__` imports.
Expand Down Expand Up @@ -91,6 +92,44 @@ pub(crate) fn unnecessary_future_import(checker: &Checker, stmt: &Stmt, names: &
if alias.asname.is_some() {
continue;
}
let is_required = match stmt {
ruff_python_ast::Stmt::ImportFrom(ruff_python_ast::StmtImportFrom {
module,
level,
..
}) => {
let name_import = NameImport::ImportFrom(MemberNameImport {
module: module.as_ref().map(std::string::ToString::to_string),
name: ruff_python_semantic::Alias {
name: alias.name.to_string(),
as_name: None,
},
level: *level,
});
checker
.settings()
.isort
.required_imports
.contains(&name_import)
}
ruff_python_ast::Stmt::Import(_) => {
let name_import = NameImport::Import(ModuleNameImport {
name: ruff_python_semantic::Alias {
name: alias.name.to_string(),
as_name: None,
},
});
checker
.settings()
.isort
.required_imports
.contains(&name_import)
}
_ => false,
};
if is_required {
continue;
}
if PY33_PLUS_REMOVE_FUTURES.contains(&alias.name.as_str())
|| PY37_PLUS_REMOVE_FUTURES.contains(&alias.name.as_str())
{
Expand Down
Loading