refactor: fix lint warnings

Author: nedbat

coverage/collector.py

@@ -10,11 +10,9 @@
 import os
 import sys
 
-from types import FrameType
-from typing import (
-    cast, Any, Callable, Dict, List, Set, TypeVar,
-)
 from collections.abc import Mapping
+from types import FrameType
+from typing import cast, Any, Callable, TypeVar
 
 from coverage import env
 from coverage.config import CoverageConfig

coverage/control.py

@@ -19,10 +19,7 @@
 import warnings
 
 from types import FrameType
-from typing import (
-    cast,
-    Any, Callable, IO, List,
-)
+from typing import cast, Any, Callable, IO
 from collections.abc import Iterable, Iterator
 
 from coverage import env

coverage/execfile.py

@@ -17,7 +17,6 @@
 from types import CodeType, ModuleType
 from typing import Any
 
-from coverage import env
 from coverage.exceptions import CoverageException, _ExceptionDuringRun, NoCode, NoSource
 from coverage.files import canonical_filename, python_reported_file
 from coverage.misc import isolate_module

coverage/files.py

@@ -100,7 +100,11 @@ def flat_rootname(filename: str) -> str:
     """
     dirname, basename = ntpath.split(filename)
     if dirname:
-        fp = hashlib.new("sha3_256", dirname.encode("UTF-8"), usedforsecurity=False).hexdigest()[:16]
+        fp = hashlib.new(
+            "sha3_256",
+            dirname.encode("UTF-8"),
+            usedforsecurity=False,
+        ).hexdigest()[:16]
         prefix = f"z_{fp}_"
     else:
         prefix = ""

coverage/jsonreport.py

@@ -9,8 +9,8 @@
 import json
 import sys
 
-from typing import Any, Dict, IO, TYPE_CHECKING
 from collections.abc import Iterable
+from typing import Any, IO, TYPE_CHECKING
 
 from coverage import __version__
 from coverage.report_core import get_analysis_to_report

coverage/parser.py

@@ -14,13 +14,10 @@
 import token
 import tokenize
 
+from collections.abc import Iterable, Sequence
 from dataclasses import dataclass
 from types import CodeType
-from typing import (
-    cast, Any, Callable, Dict, List, Optional, Protocol,
-    Set, Tuple,
-)
-from collections.abc import Iterable, Sequence
+from typing import cast, Callable, Optional, Protocol
 
 from coverage import env
 from coverage.bytecode import code_objects

coverage/pytracer.py

@@ -12,7 +12,7 @@
 import threading
 
 from types import FrameType, ModuleType
-from typing import Any, Callable, Set, cast
+from typing import Any, Callable, cast
 
 from coverage import env
 from coverage.types import (

coverage/results.py

@@ -8,9 +8,8 @@
 import collections
 import dataclasses
 
-from collections.abc import Container
+from collections.abc import Container, Iterable
 from typing import TYPE_CHECKING
-from collections.abc import Iterable
 
 from coverage.exceptions import ConfigError
 from coverage.misc import nice_pair

coverage/sqlitedb.py

@@ -9,7 +9,7 @@
 import re
 import sqlite3
 
-from typing import cast, Any, Tuple
+from typing import cast, Any
 from collections.abc import Iterable, Iterator
 
 from coverage.debug import auto_repr, clipped_repr, exc_one_line

coverage/sysmon.py

@@ -18,7 +18,6 @@
 from typing import (
     Any,
     Callable,
-    Set,
     TYPE_CHECKING,
     cast,
 )

coverage/templite.py

@@ -15,7 +15,7 @@
 import re
 
 from typing import (
-    Any, Callable, Dict, NoReturn, cast,
+    Any, Callable, NoReturn, cast,
 )
 
 

coverage/types.py

@@ -10,12 +10,12 @@
 import os
 import pathlib
 
+from collections.abc import Iterable, Mapping
 from types import FrameType, ModuleType
 from typing import (
-    Any, Callable, Dict, List, Optional, Protocol,
-    Set, Tuple, Type, Union, TYPE_CHECKING,
+    Any, Callable, Optional, Protocol,
+    Union, TYPE_CHECKING,
 )
-from collections.abc import Iterable, Mapping
 
 if TYPE_CHECKING:
     from coverage.plugin import FileTracer

pyproject.toml

@@ -89,6 +89,7 @@ disable = [
     "missing-timeout",
     "too-many-lines",
     "use-implicit-booleaness-not-comparison",
+    "too-many-positional-arguments",
     # Formatting stuff
     "superfluous-parens",
     # Messages that are noisy for now, eventually maybe we'll turn them on:

tests/helpers.py

@@ -25,7 +25,6 @@
 from collections.abc import Iterable, Iterator
 
 import flaky
-import pytest
 
 from coverage import env
 from coverage.debug import DebugControl

tests/mixins.py

@@ -14,8 +14,8 @@
 import os.path
 import sys
 
-from typing import Any, Callable, Tuple, cast
 from collections.abc import Iterable, Iterator
+from typing import Any, Callable, cast
 
 import pytest
 

tests/plugin_config.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-from typing import Any, List, cast
+from typing import Any, cast
 
 import coverage
 from coverage.plugin_support import Plugins

tests/test_regions.py

@@ -12,7 +12,6 @@
 import pytest
 
 import coverage
-from coverage import env
 from coverage.plugin import CodeRegion
 from coverage.regions import code_regions
 

tests/test_setup.py

@@ -7,7 +7,7 @@
 
 import sys
 
-from typing import List, cast
+from typing import cast
 
 import pytest