refactor: pyupgrade --py39-plus coverage/*.py tests/*.py

coverage/annotate.py

@@ -8,7 +8,8 @@
 import os
 import re
 
-from typing import Iterable, TYPE_CHECKING
+from typing import TYPE_CHECKING
+from collections.abc import Iterable
 
 from coverage.files import flat_rootname
 from coverage.misc import ensure_dir, isolate_module

coverage/bytecode.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 from types import CodeType
-from typing import Iterator
+from collections.abc import Iterator
 
 
 def code_objects(code: CodeType) -> Iterator[CodeType]:

coverage/collector.py

@@ -12,8 +12,9 @@
 
 from types import FrameType
 from typing import (
-    cast, Any, Callable, Dict, List, Mapping, Set, TypeVar,
+    cast, Any, Callable, Dict, List, Set, TypeVar,
 )
+from collections.abc import Mapping
 
 from coverage import env
 from coverage.config import CoverageConfig
@@ -420,7 +421,7 @@ def disable_plugin(self, disposition: TFileDisposition) -> None:
         plugin._coverage_enabled = False
         disposition.trace = False
 
-    @functools.lru_cache(maxsize=None)          # pylint: disable=method-cache-max-size-none
+    @functools.cache          # pylint: disable=method-cache-max-size-none
     def cached_mapped_file(self, filename: str) -> str:
         """A locally cached version of file names mapped through file_mapper."""
         return self.file_mapper(filename)
@@ -466,7 +467,7 @@ def flush_data(self) -> bool:
                 # tracer.c:CTracer_record_pair for the C code that creates
                 # these packed ints.
                 arc_data: dict[str, list[TArc]] = {}
-                packed_data = cast(Dict[str, Set[int]], self.data)
+                packed_data = cast(dict[str, set[int]], self.data)
 
                 # The list() here and in the inner loop are to get a clean copy
                 # even as tracers are continuing to add data.
@@ -482,10 +483,10 @@ def flush_data(self) -> bool:
                         tuples.append((l1, l2))
                     arc_data[fname] = tuples
             else:
-                arc_data = cast(Dict[str, List[TArc]], self.data)
+                arc_data = cast(dict[str, list[TArc]], self.data)
             self.covdata.add_arcs(self.mapped_file_dict(arc_data))
         else:
-            line_data = cast(Dict[str, Set[int]], self.data)
+            line_data = cast(dict[str, set[int]], self.data)
             self.covdata.add_lines(self.mapped_file_dict(line_data))
 
         file_tracers = {

coverage/config.py

@@ -13,8 +13,9 @@
 import re
 
 from typing import (
-    Any, Callable, Iterable, Union,
+    Any, Callable, Union,
 )
+from collections.abc import Iterable
 
 from coverage.exceptions import ConfigError
 from coverage.misc import isolate_module, human_sorted_items, substitute_variables

coverage/context.py

@@ -6,7 +6,8 @@
 from __future__ import annotations
 
 from types import FrameType
-from typing import cast, Sequence
+from typing import cast
+from collections.abc import Sequence
 
 from coverage.types import TShouldStartContextFn
 

coverage/control.py

@@ -21,8 +21,9 @@
 from types import FrameType
 from typing import (
     cast,
-    Any, Callable, IO, Iterable, Iterator, List,
+    Any, Callable, IO, List,
 )
+from collections.abc import Iterable, Iterator
 
 from coverage import env
 from coverage.annotate import AnnotateReporter
@@ -784,7 +785,7 @@ def get_exclude_list(self, which: str = "exclude") -> list[str]:
 
         """
         self._init()
-        return cast(List[str], getattr(self.config, which + "_list"))
+        return cast(list[str], getattr(self.config, which + "_list"))
 
     def save(self) -> None:
         """Save the collected coverage data to the data file."""

coverage/data.py

@@ -17,7 +17,8 @@
 import hashlib
 import os.path
 
-from typing import Callable, Iterable
+from typing import Callable
+from collections.abc import Iterable
 
 from coverage.exceptions import CoverageException, NoDataError
 from coverage.files import PathAliases
@@ -138,7 +139,7 @@ def combine_parallel_data(
     if aliases is None:
         map_path = None
     else:
-        map_path = functools.lru_cache(maxsize=None)(aliases.map)
+        map_path = functools.cache(aliases.map)
 
     file_hashes = set()
     combined_any = False

coverage/debug.py

@@ -21,8 +21,9 @@
 
 from typing import (
     overload,
-    Any, Callable, IO, Iterable, Iterator, Mapping,
+    Any, Callable, IO,
 )
+from collections.abc import Iterable, Iterator, Mapping
 
 from coverage.misc import human_sorted_items, isolate_module
 from coverage.types import AnyCallable, TWritable

coverage/env.py

@@ -9,7 +9,8 @@
 import platform
 import sys
 
-from typing import Any, Iterable
+from typing import Any
+from collections.abc import Iterable
 
 # debug_info() at the bottom wants to show all the globals, but not imports.
 # Grab the global names here to know which names to not show. Nothing defined

coverage/files.py

@@ -13,7 +13,8 @@
 import re
 import sys
 
-from typing import Callable, Iterable
+from typing import Callable
+from collections.abc import Iterable
 
 from coverage import env
 from coverage.exceptions import ConfigError

coverage/html.py

@@ -15,7 +15,8 @@
 import string
 
 from dataclasses import dataclass, field
-from typing import Any, Iterable, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
+from collections.abc import Iterable
 
 import coverage
 from coverage.data import CoverageData, add_data_to_hash
@@ -201,7 +202,7 @@ def __init__(self, fr: FileReporter, analysis: Analysis) -> None:
 
 HTML_SAFE = string.ascii_letters + string.digits + "!#$%'()*+,-./:;=?@[]^_`{|}~"
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def encode_int(n: int) -> str:
     """Create a short HTML-safe string from an integer, using HTML_SAFE."""
     if n == 0:

coverage/inorout.py

@@ -17,8 +17,9 @@
 
 from types import FrameType, ModuleType
 from typing import (
-    cast, Any, Iterable, TYPE_CHECKING,
+    cast, Any, TYPE_CHECKING,
 )
+from collections.abc import Iterable
 
 from coverage import env
 from coverage.disposition import FileDisposition, disposition_init

coverage/jsonreport.py

@@ -9,7 +9,8 @@
 import json
 import sys
 
-from typing import Any, Dict, IO, Iterable, TYPE_CHECKING
+from typing import Any, Dict, IO, TYPE_CHECKING
+from collections.abc import Iterable
 
 from coverage import __version__
 from coverage.report_core import get_analysis_to_report
@@ -23,7 +24,7 @@
 
 
 # A type for data that can be JSON-serialized.
-JsonObj = Dict[str, Any]
+JsonObj = dict[str, Any]
 
 # "Version 1" had no format number at all.
 # 2: add the meta.format field.

coverage/lcovreport.py

@@ -9,7 +9,8 @@
 import hashlib
 import sys
 
-from typing import IO, Iterable, TYPE_CHECKING
+from typing import IO, TYPE_CHECKING
+from collections.abc import Iterable
 
 from coverage.plugin import FileReporter
 from coverage.report_core import get_analysis_to_report

coverage/misc.py

@@ -21,8 +21,9 @@
 
 from types import ModuleType
 from typing import (
-    Any, Iterable, Iterator, Mapping, NoReturn, Sequence, TypeVar,
+    Any, NoReturn, TypeVar,
 )
+from collections.abc import Iterable, Iterator, Mapping, Sequence
 
 from coverage.exceptions import CoverageException
 from coverage.types import TArc
@@ -301,7 +302,7 @@ def import_local_file(modname: str, modfile: str | None = None) -> ModuleType:
     return mod
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def _human_key(s: str) -> tuple[list[str | int], str]:
     """Turn a string into a list of string and number chunks.
 

coverage/numbits.py

@@ -20,7 +20,7 @@
 import sqlite3
 
 from itertools import zip_longest
-from typing import Iterable
+from collections.abc import Iterable
 
 
 def nums_to_numbits(nums: Iterable[int]) -> bytes:

coverage/parser.py

@@ -17,9 +17,10 @@
 from dataclasses import dataclass
 from types import CodeType
 from typing import (
-    cast, Any, Callable, Dict, Iterable, List, Optional, Protocol, Sequence,
+    cast, Any, Callable, Dict, List, Optional, Protocol,
     Set, Tuple,
 )
+from collections.abc import Iterable, Sequence
 
 from coverage import env
 from coverage.bytecode import code_objects
@@ -324,7 +325,7 @@ def fix_with_jumps(self, arcs: Iterable[TArc]) -> set[TArc]:
                     to_remove.add(start_next)
         return (set(arcs) | to_add) - to_remove
 
-    @functools.lru_cache()
+    @functools.lru_cache
     def exit_counts(self) -> dict[TLineNo, int]:
         """Get a count of exits from that each line.
 
@@ -515,7 +516,7 @@ def __call__(
         """
 
 
-TArcFragments = Dict[TArc, List[Tuple[Optional[str], Optional[str]]]]
+TArcFragments = dict[TArc, list[tuple[Optional[str], Optional[str]]]]
 
 class Block:
     """
@@ -851,7 +852,7 @@ def node_exits(self, node: ast.AST) -> set[ArcStart]:
         """
         node_name = node.__class__.__name__
         handler = cast(
-            Optional[Callable[[ast.AST], Set[ArcStart]]],
+            Optional[Callable[[ast.AST], set[ArcStart]]],
             getattr(self, "_handle__" + node_name, None),
         )
         if handler is not None:

coverage/phystokens.py

@@ -13,7 +13,7 @@
 import token
 import tokenize
 
-from typing import Iterable
+from collections.abc import Iterable
 
 from coverage import env
 from coverage.types import TLineNo, TSourceTokenLines

coverage/plugin.py

@@ -118,7 +118,8 @@ def coverage_init(reg, options):
 import functools
 
 from types import FrameType
-from typing import Any, Iterable
+from typing import Any
+from collections.abc import Iterable
 
 from coverage import files
 from coverage.misc import _needs_to_implement

coverage/plugin_support.py

@@ -10,7 +10,8 @@
 import sys
 
 from types import FrameType
-from typing import Any, Iterable, Iterator
+from typing import Any
+from collections.abc import Iterable, Iterator
 
 from coverage.exceptions import PluginError
 from coverage.misc import isolate_module

coverage/python.py

@@ -9,7 +9,8 @@
 import types
 import zipimport
 
-from typing import Iterable, TYPE_CHECKING
+from typing import TYPE_CHECKING
+from collections.abc import Iterable
 
 from coverage import env
 from coverage.exceptions import CoverageException, NoSource

coverage/pytracer.py

@@ -253,9 +253,9 @@ def _trace(
                 flineno: TLineNo = frame.f_lineno
 
                 if self.trace_arcs:
-                    cast(Set[TArc], self.cur_file_data).add((self.last_line, flineno))
+                    cast(set[TArc], self.cur_file_data).add((self.last_line, flineno))
                 else:
-                    cast(Set[TLineNo], self.cur_file_data).add(flineno)
+                    cast(set[TLineNo], self.cur_file_data).add(flineno)
                 self.last_line = flineno
 
         elif event == "return":
@@ -286,7 +286,7 @@ def _trace(
                         real_return = True
                 if real_return:
                     first = frame.f_code.co_firstlineno
-                    cast(Set[TArc], self.cur_file_data).add((self.last_line, -first))
+                    cast(set[TArc], self.cur_file_data).add((self.last_line, -first))
 
             # Leaving this function, pop the filename stack.
             self.cur_file_data, self.cur_file_name, self.last_line, self.started_context = (

coverage/report.py

@@ -7,7 +7,8 @@
 
 import sys
 
-from typing import Any, IO, Iterable, TYPE_CHECKING
+from typing import Any, IO, TYPE_CHECKING
+from collections.abc import Iterable
 
 from coverage.exceptions import ConfigError, NoDataError
 from coverage.misc import human_sorted_items

coverage/report_core.py

@@ -8,8 +8,9 @@
 import sys
 
 from typing import (
-    Callable, Iterable, Iterator, IO, Protocol, TYPE_CHECKING,
+    Callable, IO, Protocol, TYPE_CHECKING,
 )
+from collections.abc import Iterable, Iterator
 
 from coverage.exceptions import NoDataError, NotPython
 from coverage.files import prep_patterns, GlobMatcher

coverage/results.py

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

coverage/sqldata.py

@@ -21,9 +21,9 @@
 import zlib
 
 from typing import (
-    cast, Any, Callable, Collection, Mapping,
-    Sequence,
+    cast, Any, Callable,
 )
+from collections.abc import Collection, Mapping, Sequence
 
 from coverage.debug import NoDebugging, auto_repr
 from coverage.exceptions import CoverageException, DataError