diff --git a/coverage/collector.py b/coverage/collector.py index 7f29f534e..53fa6871c 100644 --- a/coverage/collector.py +++ b/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 diff --git a/coverage/control.py b/coverage/control.py index f5a633a25..b052d4b4c 100644 --- a/coverage/control.py +++ b/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 diff --git a/coverage/execfile.py b/coverage/execfile.py index 992726db5..cbecec847 100644 --- a/coverage/execfile.py +++ b/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 diff --git a/coverage/files.py b/coverage/files.py index 7c59de43d..15d39acbd 100644 --- a/coverage/files.py +++ b/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 = "" diff --git a/coverage/jsonreport.py b/coverage/jsonreport.py index a7fa29e25..00053ebfb 100644 --- a/coverage/jsonreport.py +++ b/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 diff --git a/coverage/parser.py b/coverage/parser.py index f2ca45e12..2ac149a94 100644 --- a/coverage/parser.py +++ b/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 diff --git a/coverage/pytracer.py b/coverage/pytracer.py index 1655391a8..81401db35 100644 --- a/coverage/pytracer.py +++ b/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 ( diff --git a/coverage/results.py b/coverage/results.py index a450d16b1..bb2187b72 100644 --- a/coverage/results.py +++ b/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 diff --git a/coverage/sqlitedb.py b/coverage/sqlitedb.py index 5ae6761d0..1bbe7e1ba 100644 --- a/coverage/sqlitedb.py +++ b/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 diff --git a/coverage/sysmon.py b/coverage/sysmon.py index c489e7905..2252ae11e 100644 --- a/coverage/sysmon.py +++ b/coverage/sysmon.py @@ -18,7 +18,6 @@ from typing import ( Any, Callable, - Set, TYPE_CHECKING, cast, ) diff --git a/coverage/templite.py b/coverage/templite.py index 87e10ff2a..4689f9573 100644 --- a/coverage/templite.py +++ b/coverage/templite.py @@ -15,7 +15,7 @@ import re from typing import ( - Any, Callable, Dict, NoReturn, cast, + Any, Callable, NoReturn, cast, ) diff --git a/coverage/types.py b/coverage/types.py index a3e8962ab..bcf8396d6 100644 --- a/coverage/types.py +++ b/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 diff --git a/pyproject.toml b/pyproject.toml index 7dc56333f..d81582e29 100644 --- a/pyproject.toml +++ b/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: diff --git a/tests/helpers.py b/tests/helpers.py index 681193ebf..82733694c 100644 --- a/tests/helpers.py +++ b/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 diff --git a/tests/mixins.py b/tests/mixins.py index 0a7f72290..0e615cd71 100644 --- a/tests/mixins.py +++ b/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 diff --git a/tests/plugin_config.py b/tests/plugin_config.py index 029e309f4..a32f485d9 100644 --- a/tests/plugin_config.py +++ b/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 diff --git a/tests/test_regions.py b/tests/test_regions.py index cb99ccfbd..b7ceacc64 100644 --- a/tests/test_regions.py +++ b/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 diff --git a/tests/test_setup.py b/tests/test_setup.py index 8e11a9c21..c0cfa7eb7 100644 --- a/tests/test_setup.py +++ b/tests/test_setup.py @@ -7,7 +7,7 @@ import sys -from typing import List, cast +from typing import cast import pytest