Small cleanup

This cleanup is the result of a rebase. It would be more effort to
incorporate these fixes into their original commits.

Signed-off-by: Carmen Bianca BAKKER <[email protected]>

src/reuse/global_licensing.py

@@ -38,9 +38,9 @@
 from debian.copyright import Error as DebianError
 from license_expression import ExpressionError
 
+from . import ReuseException, ReuseInfo, SourceType
 from ._util import _LICENSING, StrPath, is_relative_to
 from .covered_files import iter_files
-from . import ReuseException, ReuseInfo, SourceType
 from .vcs import VCSStrategy
 
 _LOGGER = logging.getLogger(__name__)

src/reuse/project.py

@@ -21,14 +21,11 @@
     Collection,
     DefaultDict,
     Dict,
-    Generator,
     Iterator,
     List,
     NamedTuple,
     Optional,
-    Set,
     Type,
-    cast,
 )
 
 import attrs
@@ -40,7 +37,6 @@
     _LICENSEREF_PATTERN,
     StrPath,
     _determine_license_path,
-    is_relative_to,
     relative_from_root,
     reuse_info_of_file,
 )

tests/test_covered_files.py

@@ -113,10 +113,11 @@ def test_include_meson_subprojects(self, empty_directory):
         subprojects_dir.mkdir()
         libfoo_dir = subprojects_dir / "libfoo"
         libfoo_dir.mkdir()
-        (libfoo_dir / "bar.py").write_text("pass")
+        bar_file = libfoo_dir / "bar.py"
+        bar_file.write_text("pass")
 
-        assert (libfoo_dir / "bar.py") not in iter_files(empty_directory)
-        assert (libfoo_dir / "bar.py") in iter_files(
+        assert bar_file not in iter_files(empty_directory)
+        assert bar_file in iter_files(
             empty_directory, include_meson_subprojects=True
         )
 
@@ -260,7 +261,7 @@ def test_include_submodules(self, submodule_repository):
         )
 
     def test_submodule_is_ignored(self, submodule_repository):
-        """If a submodule is ignored, iter_files should not raise an Exception"""
+        """If a submodule is ignored, iter_files shouldn't raise an Exception"""
         (submodule_repository / "submodule/foo.py").write_text("foo")
         gitignore = submodule_repository / ".gitignore"
         contents = gitignore.read_text()