[ruff F401 #10390 #10391] restore the old condition used to enable/di…

…sable F401 based on deprecated flag, but use the preview flag; move the testcases down to the preview testcase section; move the insta-snapshots to the preview paths

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

@@ -56,8 +56,6 @@ mod tests {
     #[test_case(Rule::UnusedImport, Path::new("F401_21.py"))]
     #[test_case(Rule::UnusedImport, Path::new("F401_22.py"))]
     #[test_case(Rule::UnusedImport, Path::new("F401_23.py"))]
-    #[test_case(Rule::UnusedImport, Path::new("F401_24/__init__.py"))]
-    #[test_case(Rule::UnusedImport, Path::new("F401_25__all/__init__.py"))]
     #[test_case(Rule::ImportShadowedByLoopVar, Path::new("F402.py"))]
     #[test_case(Rule::ImportShadowedByLoopVar, Path::new("F402.ipynb"))]
     #[test_case(Rule::UndefinedLocalWithImportStar, Path::new("F403.py"))]
@@ -207,6 +205,8 @@ mod tests {
     }
 
     #[test_case(Rule::UnusedVariable, Path::new("F841_4.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_24/__init__.py"))]
+    #[test_case(Rule::UnusedImport, Path::new("F401_25__all/__init__.py"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "preview__{}_{}",

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

@@ -192,6 +192,7 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope, diagnostics: &mut
     }
 
     let in_init = checker.path().ends_with("__init__.py");
+    let fix_init = checker.settings.preview.is_enabled();
     // TODO: find the `__all__` node
     let dunder_all = None;
 
@@ -211,15 +212,14 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope, diagnostics: &mut
                 });
 
         // generate fixes that are shared across bindings in the statement
-        let (fix_remove, fix_explicit) =
-            if !in_except_handler && checker.settings.preview.is_enabled() {
-                (
-                    fix_by_removing_imports(checker, import_statement, &to_remove, in_init).ok(),
-                    fix_by_reexporting(checker, import_statement, &to_explicit, dunder_all).ok(),
-                )
-            } else {
-                (None, None)
-            };
+        let (fix_remove, fix_explicit) = if (!in_init || fix_init) && !in_except_handler {
+            (
+                fix_by_removing_imports(checker, import_statement, &to_remove, in_init).ok(),
+                fix_by_reexporting(checker, import_statement, &to_explicit, dunder_all).ok(),
+            )
+        } else {
+            (None, None)
+        };
 
         for (binding, fix) in iter::Iterator::chain(
             iter::zip(to_remove, iter::repeat(fix_remove)),