[pyflakes] make F401 autofix "suggested" in __init__.py files

crates/ruff/src/rules/pyflakes/mod.rs

@@ -160,7 +160,11 @@ mod tests {
     fn init() -> Result<()> {
         let diagnostics = test_path(
             Path::new("pyflakes/__init__.py"),
-            &Settings::for_rules(vec![Rule::UndefinedName, Rule::UndefinedExport]),
+            &Settings::for_rules(vec![
+                Rule::UndefinedName,
+                Rule::UndefinedExport,
+                Rule::UnusedImport,
+            ]),
         )?;
         assert_messages!(diagnostics);
         Ok(())

crates/ruff/src/rules/pyflakes/rules/unused_import.rs

@@ -142,8 +142,7 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope, diagnostics: &mut
         }
     }
 
-    let in_init =
-        checker.settings.ignore_init_module_imports && checker.path().ends_with("__init__.py");
+    let in_init = checker.path().ends_with("__init__.py");
 
     // Generate a diagnostic for every import, but share a fix across all imports within the same
     // statement (excluding those that are ignored).
@@ -152,8 +151,8 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope, diagnostics: &mut
             exceptions.intersects(Exceptions::MODULE_NOT_FOUND_ERROR | Exceptions::IMPORT_ERROR);
         let multiple = imports.len() > 1;
 
-        let fix = if !in_init && !in_except_handler && checker.patch(Rule::UnusedImport) {
-            fix_imports(checker, stmt_id, &imports).ok()
+        let fix = if !in_except_handler && checker.patch(Rule::UnusedImport) {
+            fix_imports(checker, stmt_id, &imports, in_init).ok()
         } else {
             None
         };
@@ -224,7 +223,12 @@ struct Import<'a> {
 }
 
 /// Generate a [`Fix`] to remove unused imports from a statement.
-fn fix_imports(checker: &Checker, stmt_id: NodeId, imports: &[Import]) -> Result<Fix> {
+fn fix_imports(
+    checker: &Checker,
+    stmt_id: NodeId,
+    imports: &[Import],
+    in_init: bool,
+) -> Result<Fix> {
     let stmt = checker.semantic().stmts[stmt_id];
     let parent = checker.semantic().stmts.parent(stmt);
     let edit = autofix::edits::remove_unused_imports(
@@ -237,5 +241,9 @@ fn fix_imports(checker: &Checker, stmt_id: NodeId, imports: &[Import]) -> Result
         checker.stylist,
         checker.indexer,
     )?;
-    Ok(Fix::automatic(edit).isolate(checker.isolation(parent)))
+    if in_init {
+        Ok(Fix::suggested(edit).isolate(checker.isolation(parent)))
+    } else {
+        Ok(Fix::automatic(edit).isolate(checker.isolation(parent)))
+    }
 }

crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__init.snap

@@ -1,4 +1,19 @@
 ---
 source: crates/ruff/src/rules/pyflakes/mod.rs
 ---
+__init__.py:1:8: F401 [*] `os` imported but unused; consider adding to `__all__` or using a redundant alias
+  |
+1 | import os
+  |        ^^ F401
+2 | 
+3 | print(__path__)
+  |
+  = help: Remove unused import: `os`
+
+ℹ Suggested fix
+1   |-import os
+2 1 | 
+3 2 | print(__path__)
+4 3 | 
+
 

crates/ruff/src/settings/options.rs

@@ -286,6 +286,8 @@ pub struct Options {
     /// imports will still be flagged, but with a dedicated message suggesting
     /// that the import is either added to the module's `__all__` symbol, or
     /// re-exported with a redundant alias (e.g., `import os as os`).
+    ///
+    /// This option has been **deprecated** and its effect is now the default behavior.
     pub ignore_init_module_imports: Option<bool>,
     #[option(
         default = r#"["*.py", "*.pyi", "**/pyproject.toml"]"#,