Handle F401 exclusions more granularly

Author: Repiteo

CHANGES.txt

@@ -15,6 +15,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
   From John Doe:
     - Whatever John Doe did.
 
+  From Thaddeus Crews:
+    - Ruff: Handle F401 exclusions more granularly, remove per-file exclusions.
+
   From William Deegan:
     - Fix SCons Docbook schema to work with lxml > 5
 

RELEASE.txt

@@ -70,6 +70,8 @@ DEVELOPMENT
 
 - Introduce some unit tests for the file locking utility routines
 
+- Ruff: Handle F401 exclusions more granularly, remove per-file exclusions.
+
 Thanks to the following contributors listed below for their contributions to this release.
 ==========================================================================================
 .. code-block:: text

SCons/Util/__init__.py

@@ -52,21 +52,19 @@
 from __future__ import annotations
 
 import copy
-import hashlib
 import logging
 import os
 import re
 import sys
 import time
 from collections import UserDict, UserList, deque
 from contextlib import suppress
-from types import MethodType, FunctionType
 from typing import Any
 from logging import Formatter
 
 # Util split into a package. Make sure things that used to work
 # when importing just Util itself still work:
-from .sctypes import (
+from .sctypes import (  # noqa: F401
     DictTypes,
     ListTypes,
     SequenceTypes,
@@ -90,7 +88,7 @@
     get_os_env_bool,
     get_environment_var,
 )
-from .hashes import (
+from .hashes import (  # noqa: F401
     ALLOWED_HASH_FORMATS,
     DEFAULT_HASH_FORMATS,
     get_hash_format,
@@ -103,15 +101,15 @@
     MD5filesignature,
     MD5collect,
 )
-from .envs import (
+from .envs import (  # noqa: F401
     MethodWrapper,
     PrependPath,
     AppendPath,
     AddPathIfNotExists,
     AddMethod,
     is_valid_construction_var,
 )
-from .filelock import FileLock, SConsLockFailure
+from .filelock import FileLock, SConsLockFailure  # noqa: F401
 
 PYPY = hasattr(sys, 'pypy_translation_info')
 

SCons/Variables/__init__.py

@@ -34,7 +34,6 @@
 
 import SCons.Errors
 import SCons.Util
-import SCons.Warnings
 
 # Note: imports are for the benefit of SCons.Main (and tests); since they
 #   are not used here, the "as Foo" form is for checkers.

pyproject.toml

@@ -117,14 +117,6 @@ extend-safe-fixes = ["FA", "UP006", "UP007"]
 [tool.ruff.format]
 quote-style = "preserve" # Equivalent to black's "skip-string-normalization"
 
-[tool.ruff.lint.per-file-ignores]
-"SCons/Util/__init__.py" = [
-    "F401",  # Module imported but unused
-]
-"SCons/Variables/__init__.py" = [
-    "F401",  # Symbol imported but unused
-]
-
 [tool.mypy]
 python_version = "3.8"
 exclude = [

test/Scanner/Python/script.py

@@ -2,8 +2,8 @@
 #
 # Copyright The SCons Foundation
 
-import package1  # noqa: F401
-import package2  # noqa: F401
+import package1
+import package2
 import sys
 
 with open(sys.argv[1], 'w') as f:

test/Scanner/Python/to_be_copied/__init__.py

@@ -2,4 +2,4 @@
 #
 # Copyright The SCons Foundation
 
-from . import helper  # noqa: F401
+from . import helper

test/fixture/python_scanner/from_import_simple_package_module1_func.py

@@ -2,4 +2,4 @@
 #
 # Copyright The SCons Foundation
 
-from simple_package.module1 import somefunc  # noqa: F401
+from simple_package.module1 import somefunc

test/fixture/python_scanner/from_nested1_import_multiple.py

@@ -2,4 +2,4 @@
 #
 # Copyright The SCons Foundation
 
-from nested1 import module, nested2  # noqa: F401
+from nested1 import module, nested2

test/fixture/python_scanner/imports_unknown_files.py

@@ -2,6 +2,6 @@
 #
 # Copyright The SCons Foundation
 
-import doesntexist  # noqa: F401
-import notthere.something  # noqa: F401
-from notthere import a, few, things  # noqa: F401
+import doesntexist
+import notthere.something
+from notthere import a, few, things