coverage 7.10.7__cp313-cp313-win_arm64.whl → 7.11.0__cp313-cp313-win_arm64.whl

coverage/cmdline.py

@@ -24,7 +24,7 @@ from coverage.control import DEFAULT_DATAFILE
 from coverage.core import CTRACER_FILE
 from coverage.data import combinable_files, debug_data_file
 from coverage.debug import info_header, short_stack, write_formatted_info
-from coverage.exceptions import NoSource, _BaseCoverageException, _ExceptionDuringRun
+from coverage.exceptions import NoSource, CoverageException, _ExceptionDuringRun
 from coverage.execfile import PyRunner
 from coverage.results import display_covered, should_fail_under
 from coverage.version import __url__
@@ -1139,7 +1139,7 @@ def main(argv: list[str] | None = None) -> int | None:
         # exception.
         traceback.print_exception(*err.args)  # pylint: disable=no-value-for-parameter
         status = ERR
-    except _BaseCoverageException as err:
+    except CoverageException as err:
         # A controlled error inside coverage.py: print the message to the user.
         msg = err.args[0]
         if err.slug:

coverage/collector.py

@@ -146,12 +146,12 @@ class Collector:
                 self.concur_id_func = greenlet.getcurrent
             elif "eventlet" in concurrencies:
                 tried = "eventlet"
-                import eventlet.greenthread  # pylint: disable=import-error,useless-suppression
+                import eventlet.greenthread
 
                 self.concur_id_func = eventlet.greenthread.getcurrent
             elif "gevent" in concurrencies:
                 tried = "gevent"
-                import gevent  # pylint: disable=import-error,useless-suppression
+                import gevent
 
                 self.concur_id_func = gevent.getcurrent
 

coverage/config.py

@@ -14,7 +14,7 @@ import os
 import os.path
 import re
 from collections.abc import Iterable
-from typing import Any, Callable, Final, Mapping, Union
+from typing import Any, Callable, Final, Mapping
 
 from coverage.exceptions import ConfigError
 from coverage.misc import human_sorted_items, isolate_module, substitute_variables
@@ -143,7 +143,7 @@ class HandyConfigParser(configparser.ConfigParser):
         return process_regexlist(section, option, line_list.splitlines())
 
 
-TConfigParser = Union[HandyConfigParser, TomlConfigParser]
+TConfigParser = HandyConfigParser | TomlConfigParser
 
 
 # The default line exclusion regexes.

coverage/control.py

@@ -19,7 +19,7 @@ import time
 import warnings
 from collections.abc import Iterable, Iterator
 from types import FrameType
-from typing import IO, Any, Callable, Union, cast
+from typing import IO, Any, Callable, cast
 
 from coverage import env
 from coverage.annotate import AnnotateReporter
@@ -298,7 +298,7 @@ class Coverage(TConfigurable):
         self._debug: DebugControl = NoDebugging()
         self._inorout: InOrOut | None = None
         self._plugins: Plugins = Plugins()
-        self._plugin_override = cast(Union[Iterable[TCoverageInit], None], plugins)
+        self._plugin_override = cast(Iterable[TCoverageInit] | None, plugins)
         self._data: CoverageData | None = None
         self._data_to_close: list[CoverageData] = []
         self._core: Core | None = None

coverage/debug.py

@@ -155,14 +155,15 @@ def info_formatter(info: Iterable[tuple[str, Any]]) -> Iterator[str]:
         if data == []:
             data = "-none-"
         prefix = f"{label:>{LABEL_LEN}}: "
-        if isinstance(data, tuple) and len(str(data)) < 30:
-            yield f"{prefix}{data}"
-        elif isinstance(data, (list, set, tuple)):
-            for e in data:
-                yield f"{prefix}{e}"
-                prefix = " " * (LABEL_LEN + 2)
-        else:
-            yield f"{prefix}{data}"
+        match data:
+            case tuple() if len(str(data)) < 30:
+                yield f"{prefix}{data}"
+            case tuple() | list() | set():
+                for e in data:
+                    yield f"{prefix}{e}"
+                    prefix = " " * (LABEL_LEN + 2)
+            case _:
+                yield f"{prefix}{data}"
 
 
 def write_formatted_info(

coverage/env.py

@@ -43,7 +43,7 @@ else:
 GIL = getattr(sys, "_is_gil_enabled", lambda: True)()
 
 # Do we ship compiled coveragepy wheels for this version?
-SHIPPING_WHEELS = CPYTHON and PYVERSION[:2] <= (3, 13)
+SHIPPING_WHEELS = CPYTHON and PYVERSION[:2] <= (3, 14)
 
 # Should we default to sys.monitoring?
 SYSMON_DEFAULT = CPYTHON and PYVERSION >= (3, 14)
@@ -53,63 +53,6 @@ SYSMON_DEFAULT = CPYTHON and PYVERSION >= (3, 14)
 class PYBEHAVIOR:
     """Flags indicating this Python's behavior."""
 
-    # Does Python conform to PEP626, Precise line numbers for debugging and other tools.
-    # https://www.python.org/dev/peps/pep-0626
-    pep626 = (PYVERSION > (3, 10, 0, "alpha", 4))  # fmt: skip
-
-    # Is "if __debug__" optimized away?
-    optimize_if_debug = not pep626
-
-    # Is "if not __debug__" optimized away? The exact details have changed
-    # across versions.
-    optimize_if_not_debug = 1 if pep626 else 2
-
-    # 3.7 changed how functions with only docstrings are numbered.
-    docstring_only_function = (not PYPY) and (PYVERSION <= (3, 10))
-
-    # Lines after break/continue/return/raise are no longer compiled into the
-    # bytecode.  They used to be marked as missing, now they aren't executable.
-    omit_after_jump = pep626 or PYPY
-
-    # PyPy has always omitted statements after return.
-    omit_after_return = omit_after_jump or PYPY
-
-    # Optimize away unreachable try-else clauses.
-    optimize_unreachable_try_else = pep626
-
-    # Modules used to have firstlineno equal to the line number of the first
-    # real line of code.  Now they always start at 1.
-    module_firstline_1 = pep626
-
-    # Are "if 0:" lines (and similar) kept in the compiled code?
-    keep_constant_test = pep626
-
-    # When leaving a with-block, do we visit the with-line again for the exit?
-    # For example, wwith.py:
-    #
-    #    with open("/tmp/test", "w") as f1:
-    #        a = 2
-    #        with open("/tmp/test2", "w") as f3:
-    #            print(4)
-    #
-    # % python3.9 -m trace -t wwith.py | grep wwith
-    #  --- modulename: wwith, funcname: <module>
-    # wwith.py(1): with open("/tmp/test", "w") as f1:
-    # wwith.py(2):     a = 2
-    # wwith.py(3):     with open("/tmp/test2", "w") as f3:
-    # wwith.py(4):         print(4)
-    #
-    # % python3.10 -m trace -t wwith.py | grep wwith
-    #  --- modulename: wwith, funcname: <module>
-    # wwith.py(1): with open("/tmp/test", "w") as f1:
-    # wwith.py(2):     a = 2
-    # wwith.py(3):     with open("/tmp/test2", "w") as f3:
-    # wwith.py(4):         print(4)
-    # wwith.py(3):     with open("/tmp/test2", "w") as f3:
-    # wwith.py(1): with open("/tmp/test", "w") as f1:
-    #
-    exit_through_with = (PYVERSION >= (3, 10, 0, "beta"))  # fmt: skip
-
     # When leaving a with-block, do we visit the with-line exactly,
     # or the context managers in inner-out order?
     #
@@ -147,12 +90,6 @@ class PYBEHAVIOR:
 
     exit_with_through_ctxmgr = (PYVERSION >= (3, 12, 6))  # fmt: skip
 
-    # Match-case construct.
-    match_case = (PYVERSION >= (3, 10))  # fmt: skip
-
-    # Some words are keywords in some places, identifiers in other places.
-    soft_keywords = (PYVERSION >= (3, 10))  # fmt: skip
-
     # f-strings are parsed as code, pep 701
     fstring_syntax = (PYVERSION >= (3, 12))  # fmt: skip
 

coverage/exceptions.py

@@ -8,21 +8,15 @@ from __future__ import annotations
 from typing import Any
 
 
-class _BaseCoverageException(Exception):
-    """The base-base of all Coverage exceptions."""
+class CoverageException(Exception):
+    """The base class of all exceptions raised by Coverage.py."""
 
     def __init__(self, *args: Any, slug: str | None = None) -> None:
         super().__init__(*args)
         self.slug = slug
 
 
-class CoverageException(_BaseCoverageException):
-    """The base class of all exceptions raised by Coverage.py."""
-
-    pass
-
-
-class ConfigError(_BaseCoverageException):
+class ConfigError(CoverageException):
     """A problem with a config file, or a value in one."""
 
     pass

coverage/misc.py

@@ -163,31 +163,32 @@ class Hasher:
     def update(self, v: Any) -> None:
         """Add `v` to the hash, recursively if needed."""
         self.hash.update(str(type(v)).encode("utf-8"))
-        if isinstance(v, str):
-            self.hash.update(v.encode("utf-8"))
-        elif isinstance(v, bytes):
-            self.hash.update(v)
-        elif v is None:
-            pass
-        elif isinstance(v, (int, float)):
-            self.hash.update(str(v).encode("utf-8"))
-        elif isinstance(v, (tuple, list)):
-            for e in v:
-                self.update(e)
-        elif isinstance(v, dict):
-            keys = v.keys()
-            for k in sorted(keys):
-                self.update(k)
-                self.update(v[k])
-        else:
-            for k in dir(v):
-                if k.startswith("__"):
-                    continue
-                a = getattr(v, k)
-                if inspect.isroutine(a):
-                    continue
-                self.update(k)
-                self.update(a)
+        match v:
+            case None:
+                pass
+            case str():
+                self.hash.update(v.encode("utf-8"))
+            case bytes():
+                self.hash.update(v)
+            case int() | float():
+                self.hash.update(str(v).encode("utf-8"))
+            case tuple() | list():
+                for e in v:
+                    self.update(e)
+            case dict():
+                keys = v.keys()
+                for k in sorted(keys):
+                    self.update(k)
+                    self.update(v[k])
+            case _:
+                for k in dir(v):
+                    if k.startswith("__"):
+                        continue
+                    a = getattr(v, k)
+                    if inspect.isroutine(a):
+                        continue
+                    self.update(k)
+                    self.update(a)
         self.hash.update(b".")
 
     def hexdigest(self) -> str:

coverage/parser.py

@@ -10,7 +10,6 @@ import collections
 import functools
 import os
 import re
-import sys
 import token
 import tokenize
 from collections.abc import Iterable, Sequence
@@ -299,10 +298,9 @@ class PythonParser:
         aaa = AstArcAnalyzer(self.filename, self._ast_root, self.raw_statements, self._multiline)
         aaa.analyze()
         arcs = aaa.arcs
-        if env.PYBEHAVIOR.exit_through_with:
-            self._with_jump_fixers = aaa.with_jump_fixers()
-            if self._with_jump_fixers:
-                arcs = self.fix_with_jumps(arcs)
+        self._with_jump_fixers = aaa.with_jump_fixers()
+        if self._with_jump_fixers:
+            arcs = self.fix_with_jumps(arcs)
 
         self._all_arcs = set()
         for l1, l2 in arcs:
@@ -451,33 +449,11 @@ class ByteParser:
     def _line_numbers(self) -> Iterable[TLineNo]:
         """Yield the line numbers possible in this code object.
 
-        Uses co_lnotab described in Python/compile.c to find the
-        line numbers.  Produces a sequence: l0, l1, ...
+        Uses co_lines() to produce a sequence: l0, l1, ...
         """
-        if hasattr(self.code, "co_lines"):
-            # PYVERSIONS: new in 3.10
-            for _, _, line in self.code.co_lines():
-                if line:
-                    yield line
-        else:
-            # Adapted from dis.py in the standard library.
-            byte_increments = self.code.co_lnotab[0::2]
-            line_increments = self.code.co_lnotab[1::2]
-
-            last_line_num: TLineNo | None = None
-            line_num = self.code.co_firstlineno
-            byte_num = 0
-            for byte_incr, line_incr in zip(byte_increments, line_increments):
-                if byte_incr:
-                    if line_num != last_line_num:
-                        yield line_num
-                        last_line_num = line_num
-                    byte_num += byte_incr
-                if line_incr >= 0x80:
-                    line_incr -= 0x100
-                line_num += line_incr
-            if line_num != last_line_num:
-                yield line_num
+        for _, _, line in self.code.co_lines():
+            if line:
+                yield line
 
     def _find_statements(self) -> Iterable[TLineNo]:
         """Find the statements in `self.code`.
@@ -650,19 +626,6 @@ class TryBlock(Block):
         return True
 
 
-class NodeList(ast.AST):
-    """A synthetic fictitious node, containing a sequence of nodes.
-
-    This is used when collapsing optimized if-statements, to represent the
-    unconditional execution of one of the clauses.
-
-    """
-
-    def __init__(self, body: Sequence[ast.AST]) -> None:
-        self.body = body
-        self.lineno = body[0].lineno  # type: ignore[attr-defined]
-
-
 # TODO: Shouldn't the cause messages join with "and" instead of "or"?
 
 
@@ -673,20 +636,22 @@ def is_constant_test_expr(node: ast.AST) -> tuple[bool, bool]:
     handle the kinds of constant expressions people might actually use.
 
     """
-    if isinstance(node, ast.Constant):
-        return True, bool(node.value)
-    elif isinstance(node, ast.Name):
-        if node.id in ["True", "False", "None", "__debug__"]:
-            return True, eval(node.id)  # pylint: disable=eval-used
-    elif isinstance(node, ast.UnaryOp) and isinstance(node.op, ast.Not):
-        is_constant, val = is_constant_test_expr(node.operand)
-        return is_constant, not val
-    elif isinstance(node, ast.BoolOp):
-        rets = [is_constant_test_expr(v) for v in node.values]
-        is_constant = all(is_const for is_const, _ in rets)
-        if is_constant:
-            op = any if isinstance(node.op, ast.Or) else all
-            return True, op(v for _, v in rets)
+    match node:
+        case ast.Constant():
+            return True, bool(node.value)
+        case ast.Name():
+            if node.id in ["True", "False", "None", "__debug__"]:
+                return True, eval(node.id)  # pylint: disable=eval-used
+        case ast.UnaryOp():
+            if isinstance(node.op, ast.Not):
+                is_constant, val = is_constant_test_expr(node.operand)
+                return is_constant, not val
+        case ast.BoolOp():
+            rets = [is_constant_test_expr(v) for v in node.values]
+            is_constant = all(is_const for is_const, _ in rets)
+            if is_constant:
+                op = any if isinstance(node.op, ast.Or) else all
+                return True, op(v for _, v in rets)
     return False, False
 
 
@@ -890,14 +855,8 @@ class AstArcAnalyzer:
         else:
             return node.lineno
 
-    def _line__Module(self, node: ast.Module) -> TLineNo:
-        if env.PYBEHAVIOR.module_firstline_1:
-            return 1
-        elif node.body:
-            return self.line_for_node(node.body[0])
-        else:
-            # Empty modules have no line number, they always start at 1.
-            return 1
+    def _line__Module(self, node: ast.Module) -> TLineNo:  # pylint: disable=unused-argument
+        return 1
 
     # The node types that just flow to the next node with no complications.
     OK_TO_DEFAULT = {
@@ -982,98 +941,12 @@ class AstArcAnalyzer:
         for body_node in body:
             lineno = self.line_for_node(body_node)
             if lineno not in self.statements:
-                maybe_body_node = self.find_non_missing_node(body_node)
-                if maybe_body_node is None:
-                    continue
-                body_node = maybe_body_node
-                lineno = self.line_for_node(body_node)
+                continue
             for prev_start in prev_starts:
                 self.add_arc(prev_start.lineno, lineno, prev_start.cause)
             prev_starts = self.node_exits(body_node)
         return prev_starts
 
-    def find_non_missing_node(self, node: ast.AST) -> ast.AST | None:
-        """Search `node` looking for a child that has not been optimized away.
-
-        This might return the node you started with, or it will work recursively
-        to find a child node in self.statements.
-
-        Returns a node, or None if none of the node remains.
-
-        """
-        # This repeats work just done in process_body, but this duplication
-        # means we can avoid a function call in the 99.9999% case of not
-        # optimizing away statements.
-        lineno = self.line_for_node(node)
-        if lineno in self.statements:
-            return node
-
-        missing_fn = cast(
-            Optional[Callable[[ast.AST], Optional[ast.AST]]],
-            getattr(self, f"_missing__{node.__class__.__name__}", None),
-        )
-        if missing_fn is not None:
-            ret_node = missing_fn(node)
-        else:
-            ret_node = None
-        return ret_node
-
-    # Missing nodes: _missing__*
-    #
-    # Entire statements can be optimized away by Python. They will appear in
-    # the AST, but not the bytecode.  These functions are called (by
-    # find_non_missing_node) to find a node to use instead of the missing
-    # node.  They can return None if the node should truly be gone.
-
-    def _missing__If(self, node: ast.If) -> ast.AST | None:
-        # If the if-node is missing, then one of its children might still be
-        # here, but not both. So return the first of the two that isn't missing.
-        # Use a NodeList to hold the clauses as a single node.
-        non_missing = self.find_non_missing_node(NodeList(node.body))
-        if non_missing:
-            return non_missing
-        if node.orelse:
-            return self.find_non_missing_node(NodeList(node.orelse))
-        return None
-
-    def _missing__NodeList(self, node: NodeList) -> ast.AST | None:
-        # A NodeList might be a mixture of missing and present nodes. Find the
-        # ones that are present.
-        non_missing_children = []
-        for child in node.body:
-            maybe_child = self.find_non_missing_node(child)
-            if maybe_child is not None:
-                non_missing_children.append(maybe_child)
-
-        # Return the simplest representation of the present children.
-        if not non_missing_children:
-            return None
-        if len(non_missing_children) == 1:
-            return non_missing_children[0]
-        return NodeList(non_missing_children)
-
-    def _missing__While(self, node: ast.While) -> ast.AST | None:
-        body_nodes = self.find_non_missing_node(NodeList(node.body))
-        if not body_nodes:
-            return None
-        # Make a synthetic While-true node.
-        new_while = ast.While()  # type: ignore[call-arg]
-        new_while.lineno = body_nodes.lineno  # type: ignore[attr-defined]
-        new_while.test = ast.Name()  # type: ignore[call-arg]
-        new_while.test.lineno = body_nodes.lineno  # type: ignore[attr-defined]
-        new_while.test.id = "True"
-        assert hasattr(body_nodes, "body")
-        new_while.body = body_nodes.body
-        new_while.orelse = []
-        return new_while
-
-    # In the fullness of time, these might be good tests to write:
-    #   while EXPR:
-    #   while False:
-    #   listcomps hidden deep in other expressions
-    #   listcomps hidden in lists: x = [[i for i in range(10)]]
-    #   nested function definitions
-
     # Exit processing: process_*_exits
     #
     # These functions process the four kinds of jump exits: break, continue,
@@ -1192,41 +1065,34 @@ class AstArcAnalyzer:
             exits |= self.process_body(node.orelse, from_start=from_start)
         return exits
 
-    if sys.version_info >= (3, 10):
-
-        def _handle__Match(self, node: ast.Match) -> set[ArcStart]:
-            start = self.line_for_node(node)
-            last_start = start
-            exits = set()
-            for case in node.cases:
-                case_start = self.line_for_node(case.pattern)
-                self.add_arc(last_start, case_start, "the pattern on line {lineno} always matched")
-                from_start = ArcStart(
-                    case_start,
-                    cause="the pattern on line {lineno} never matched",
-                )
-                exits |= self.process_body(case.body, from_start=from_start)
-                last_start = case_start
-
-            # case is now the last case, check for wildcard match.
-            pattern = case.pattern  # pylint: disable=undefined-loop-variable
-            while isinstance(pattern, ast.MatchOr):
-                pattern = pattern.patterns[-1]
-            while isinstance(pattern, ast.MatchAs) and pattern.pattern is not None:
-                pattern = pattern.pattern
-            had_wildcard = (
-                isinstance(pattern, ast.MatchAs) and pattern.pattern is None and case.guard is None  # pylint: disable=undefined-loop-variable
+    def _handle__Match(self, node: ast.Match) -> set[ArcStart]:
+        start = self.line_for_node(node)
+        last_start = start
+        exits = set()
+        for case in node.cases:
+            case_start = self.line_for_node(case.pattern)
+            self.add_arc(last_start, case_start, "the pattern on line {lineno} always matched")
+            from_start = ArcStart(
+                case_start,
+                cause="the pattern on line {lineno} never matched",
             )
+            exits |= self.process_body(case.body, from_start=from_start)
+            last_start = case_start
+
+        # case is now the last case, check for wildcard match.
+        pattern = case.pattern  # pylint: disable=undefined-loop-variable
+        while isinstance(pattern, ast.MatchOr):
+            pattern = pattern.patterns[-1]
+        while isinstance(pattern, ast.MatchAs) and pattern.pattern is not None:
+            pattern = pattern.pattern
+        had_wildcard = (
+            isinstance(pattern, ast.MatchAs) and pattern.pattern is None and case.guard is None  # pylint: disable=undefined-loop-variable
+        )
 
-            if not had_wildcard:
-                exits.add(
-                    ArcStart(case_start, cause="the pattern on line {lineno} always matched"),
-                )
-            return exits
-
-    def _handle__NodeList(self, node: NodeList) -> set[ArcStart]:
-        start = self.line_for_node(node)
-        exits = self.process_body(node.body, from_start=ArcStart(start))
+        if not had_wildcard:
+            exits.add(
+                ArcStart(case_start, cause="the pattern on line {lineno} always matched"),
+            )
         return exits
 
     def _handle__Raise(self, node: ast.Raise) -> set[ArcStart]:
@@ -1301,13 +1167,6 @@ class AstArcAnalyzer:
     def _handle__While(self, node: ast.While) -> set[ArcStart]:
         start = to_top = self.line_for_node(node.test)
         constant_test, _ = is_constant_test_expr(node.test)
-        top_is_body0 = False
-        if constant_test:
-            top_is_body0 = True
-        if env.PYBEHAVIOR.keep_constant_test:
-            top_is_body0 = False
-        if top_is_body0:
-            to_top = self.line_for_node(node.body[0])
         self.block_stack.append(LoopBlock(start=to_top))
         from_start = ArcStart(start, cause="the condition on line {lineno} was never true")
         exits = self.process_body(node.body, from_start=from_start)
@@ -1332,22 +1191,20 @@ class AstArcAnalyzer:
             starts = [self.line_for_node(item.context_expr) for item in node.items]
         else:
             starts = [self.line_for_node(node)]
-        if env.PYBEHAVIOR.exit_through_with:
-            for start in starts:
-                self.current_with_starts.add(start)
-                self.all_with_starts.add(start)
+        for start in starts:
+            self.current_with_starts.add(start)
+            self.all_with_starts.add(start)
 
         exits = self.process_body(node.body, from_start=ArcStart(starts[-1]))
 
-        if env.PYBEHAVIOR.exit_through_with:
-            start = starts[-1]
-            self.current_with_starts.remove(start)
-            with_exit = {ArcStart(start)}
-            if exits:
-                for xit in exits:
-                    self.add_arc(xit.lineno, start)
-                    self.with_exits.add((xit.lineno, start))
-                exits = with_exit
+        start = starts[-1]
+        self.current_with_starts.remove(start)
+        with_exit = {ArcStart(start)}
+        if exits:
+            for xit in exits:
+                self.add_arc(xit.lineno, start)
+                self.with_exits.add((xit.lineno, start))
+            exits = with_exit
 
         return exits
 

coverage/patch.py

@@ -32,20 +32,21 @@ def apply_patches(
     """Apply invasive patches requested by `[run] patch=`."""
     debug = debug if debug.should("patch") else DevNullDebug()
     for patch in sorted(set(config.patch)):
-        if patch == "_exit":
-            _patch__exit(cov, debug)
+        match patch:
+            case "_exit":
+                _patch__exit(cov, debug)
 
-        elif patch == "execv":
-            _patch_execv(cov, config, debug)
+            case "execv":
+                _patch_execv(cov, config, debug)
 
-        elif patch == "fork":
-            _patch_fork(debug)
+            case "fork":
+                _patch_fork(debug)
 
-        elif patch == "subprocess":
-            _patch_subprocess(config, debug, make_pth_file)
+            case "subprocess":
+                _patch_subprocess(config, debug, make_pth_file)
 
-        else:
-            raise ConfigError(f"Unknown patch {patch!r}")
+            case _:
+                raise ConfigError(f"Unknown patch {patch!r}")
 
 
 def _patch__exit(cov: Coverage, debug: TDebugCtl) -> None:

coverage/phystokens.py

@@ -95,7 +95,7 @@ def find_soft_key_lines(source: str) -> set[TLineNo]:
     soft_key_lines: set[TLineNo] = set()
 
     for node in ast.walk(ast.parse(source)):
-        if sys.version_info >= (3, 10) and isinstance(node, ast.Match):
+        if isinstance(node, ast.Match):
             soft_key_lines.add(node.lineno)
             for case in node.cases:
                 soft_key_lines.add(case.pattern.lineno)
@@ -128,10 +128,7 @@ def source_token_lines(source: str) -> TSourceTokenLines:
     source = source.expandtabs(8).replace("\r\n", "\n")
     tokgen = generate_tokens(source)
 
-    if env.PYBEHAVIOR.soft_keywords:
-        soft_key_lines = find_soft_key_lines(source)
-    else:
-        soft_key_lines = set()
+    soft_key_lines = find_soft_key_lines(source)
 
     for ttype, ttext, (sline, scol), (_, ecol), _ in _phys_tokens(tokgen):
         mark_start = True
@@ -157,7 +154,7 @@ def source_token_lines(source: str) -> TSourceTokenLines:
                     if keyword.iskeyword(ttext):
                         # Hard keywords are always keywords.
                         tok_class = "key"
-                    elif env.PYBEHAVIOR.soft_keywords and keyword.issoftkeyword(ttext):
+                    elif keyword.issoftkeyword(ttext):
                         # Soft keywords appear at the start of their line.
                         if len(line) == 0:
                             is_start_of_line = True

coverage/types.py

@@ -11,7 +11,7 @@ import os
 import pathlib
 from collections.abc import Iterable, Mapping
 from types import FrameType, ModuleType
-from typing import TYPE_CHECKING, Any, Callable, Optional, Protocol, Union
+from typing import TYPE_CHECKING, Any, Callable, Optional, Protocol
 
 if TYPE_CHECKING:
     from coverage.plugin import FileTracer
@@ -22,14 +22,10 @@ AnyCallable = Callable[..., Any]
 ## File paths
 
 # For arguments that are file paths:
-if TYPE_CHECKING:
-    FilePath = Union[str, os.PathLike[str]]
-else:
-    # PathLike < python3.9 doesn't support subscription
-    FilePath = Union[str, os.PathLike]
+FilePath = str | os.PathLike[str]
 # For testing FilePath arguments
 FilePathClasses = [str, pathlib.Path]
-FilePathType = Union[type[str], type[pathlib.Path]]
+FilePathType = type[str] | type[pathlib.Path]
 
 ## Python tracing
 
@@ -77,14 +73,14 @@ class TFileDisposition(Protocol):
 # - If measuring arcs in the C tracer, the values are sets of packed arcs (two
 #   line numbers combined into one integer).
 
-TTraceFileData = Union[set[TLineNo], set[TArc], set[int]]
+TTraceFileData = set[TLineNo] | set[TArc] | set[int]
 
 TTraceData = dict[str, TTraceFileData]
 
 # Functions passed into collectors.
 TShouldTraceFn = Callable[[str, FrameType], TFileDisposition]
 TCheckIncludeFn = Callable[[str, FrameType], bool]
-TShouldStartContextFn = Callable[[FrameType], Union[str, None]]
+TShouldStartContextFn = Callable[[FrameType], str | None]
 
 
 class Tracer(Protocol):
@@ -127,8 +123,8 @@ TCovKwargs = Any
 ## Configuration
 
 # One value read from a config file.
-TConfigValueIn = Optional[Union[bool, int, float, str, Iterable[str], Mapping[str, Iterable[str]]]]
-TConfigValueOut = Optional[Union[bool, int, float, str, list[str], dict[str, list[str]]]]
+TConfigValueIn = Optional[bool | int | float | str | Iterable[str] | Mapping[str, Iterable[str]]]
+TConfigValueOut = Optional[bool | int | float | str | list[str] | dict[str, list[str]]]
 # An entire config section, mapping option names to values.
 TConfigSectionIn = Mapping[str, TConfigValueIn]
 TConfigSectionOut = Mapping[str, TConfigValueOut]
@@ -169,7 +165,7 @@ class TPluginConfig(Protocol):
 
 ## Parsing
 
-TMorf = Union[ModuleType, str]
+TMorf = ModuleType | str
 
 TSourceTokenLines = Iterable[list[tuple[str, str]]]
 

coverage/version.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 
 # version_info: same semantics as sys.version_info.
 # _dev: the .devN suffix if any.
-version_info = (7, 10, 7, "final", 0)
+version_info = (7, 11, 0, "final", 0)
 _dev = 0
 
 

{coverage-7.10.7.dist-info → coverage-7.11.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: coverage
-Version: 7.10.7
+Version: 7.11.0
 Summary: Code coverage measurement for Python
 Home-page: https://github.com/nedbat/coveragepy
 Author: Ned Batchelder and 249 others
 Author-email: ned@nedbatchelder.com
 License: Apache-2.0
-Project-URL: Documentation, https://coverage.readthedocs.io/en/7.10.7
+Project-URL: Documentation, https://coverage.readthedocs.io/en/7.11.0
 Project-URL: Funding, https://tidelift.com/subscription/pkg/pypi-coverage?utm_source=pypi-coverage&utm_medium=referral&utm_campaign=pypi
 Project-URL: Issues, https://github.com/nedbat/coveragepy/issues
 Project-URL: Mastodon, https://hachyderm.io/@coveragepy
@@ -17,18 +17,18 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
 Classifier: Development Status :: 5 - Production/Stable
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Provides-Extra: toml
@@ -75,13 +75,13 @@ Coverage.py runs on these versions of Python:
 
 .. PYVERSIONS
 
-* Python 3.9 through 3.14 rc2, including free-threading.
-* PyPy3 versions 3.9, 3.10, and 3.11.
+* Python 3.10 through 3.15 alpha, including free-threading.
+* PyPy3 versions 3.10 and 3.11.
 
 Documentation is on `Read the Docs`_.  Code repository and issue tracker are on
 `GitHub`_.
 
-.. _Read the Docs: https://coverage.readthedocs.io/en/7.10.7/
+.. _Read the Docs: https://coverage.readthedocs.io/en/7.11.0/
 .. _GitHub: https://github.com/nedbat/coveragepy
 
 **New in 7.x:**
@@ -93,7 +93,7 @@ Documentation is on `Read the Docs`_.  Code repository and issue tracker are on
 multi-line exclusion patterns;
 function/class reporting;
 experimental support for sys.monitoring;
-dropped support for Python 3.7 and 3.8;
+dropped support for Python up to 3.9;
 added ``Coverage.collect()`` context manager;
 improved data combining;
 ``[run] exclude_also`` setting;
@@ -131,7 +131,7 @@ Getting Started
 Looking to run ``coverage`` on your test suite? See the `Quick Start section`_
 of the docs.
 
-.. _Quick Start section: https://coverage.readthedocs.io/en/7.10.7/#quick-start
+.. _Quick Start section: https://coverage.readthedocs.io/en/7.11.0/#quick-start
 
 
 Change history
@@ -139,7 +139,7 @@ Change history
 
 The complete history of changes is on the `change history page`_.
 
-.. _change history page: https://coverage.readthedocs.io/en/7.10.7/changes.html
+.. _change history page: https://coverage.readthedocs.io/en/7.11.0/changes.html
 
 
 Code of Conduct
@@ -158,7 +158,7 @@ Contributing
 Found a bug? Want to help improve the code or documentation? See the
 `Contributing section`_ of the docs.
 
-.. _Contributing section: https://coverage.readthedocs.io/en/7.10.7/contributing.html
+.. _Contributing section: https://coverage.readthedocs.io/en/7.11.0/contributing.html
 
 
 Security
@@ -186,7 +186,7 @@ Licensed under the `Apache 2.0 License`_.  For details, see `NOTICE.txt`_.
     :target: https://github.com/nedbat/coveragepy/actions/workflows/quality.yml
     :alt: Quality check status
 .. |docs| image:: https://readthedocs.org/projects/coverage/badge/?version=latest&style=flat
-    :target: https://coverage.readthedocs.io/en/7.10.7/
+    :target: https://coverage.readthedocs.io/en/7.11.0/
     :alt: Documentation
 .. |kit| image:: https://img.shields.io/pypi/v/coverage
     :target: https://pypi.org/project/coverage/
@@ -195,7 +195,7 @@ Licensed under the `Apache 2.0 License`_.  For details, see `NOTICE.txt`_.
     :target: https://pypi.org/project/coverage/
     :alt: Python versions supported
 .. |license| image:: https://img.shields.io/pypi/l/coverage.svg
-    :target: https://pypi.org/project/coverage/
+    :target: https://github.com/nedbat/coveragepy/blob/master/LICENSE.txt
     :alt: License
 .. |metacov| image:: https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/nedbat/8c6980f77988a327348f9b02bbaf67f5/raw/metacov.json
     :target: https://nedbat.github.io/coverage-reports/latest.html

{coverage-7.10.7.dist-info → coverage-7.11.0.dist-info}/RECORD

@@ -2,29 +2,29 @@ coverage/__init__.py,sha256=p80cmYrM35VlYk07TtKV90tz0FyOH7HFS_mMqqlkQO8,1103
 coverage/__main__.py,sha256=M2jcqCZIu_rkmoO4CKgwElX084u6SHdZfVUg3lGiWhg,307
 coverage/annotate.py,sha256=rcUxalBphRmZePMoSZO8yPCMR7NkdEKsglUmAQV7COM,3863
 coverage/bytecode.py,sha256=eaUA9uzyxoC_T11d4hdxZyRZVhtbNRDUsVlA4_sQ1rQ,6504
-coverage/cmdline.py,sha256=CDTLIuJJoIGf_NxYl11JJYxmVj5tf8FLLGPFqkCwmBo,37762
-coverage/collector.py,sha256=RG7gLhzGAu4ZCyLx5XhQEsDKdVxeSGq5uhhybhVislk,19902
-coverage/config.py,sha256=1-q4C79ea9Rv8lDu7Ra9u_1jeDHqPeOI58Efb7XsA5c,26046
+coverage/cmdline.py,sha256=dCYQCAeO2Vo56W6mrW2WXdV9qy5R7v-lm0LBCPvQHYk,37752
+coverage/collector.py,sha256=JEnp6NKbywHOopu6FXlNDlnk2NbbOqa4kNpx1FoR2zw,19798
+coverage/config.py,sha256=JL7XwK4uoW5wVMjT-hU6cFpgHCimUtUiAEQzSNaSOO4,26033
 coverage/context.py,sha256=YX7Pg0y3Og-d3qDcgoMmEpuf9jIcigcYnF0edZaqIsM,2506
-coverage/control.py,sha256=MR8t7lPGctYRbws-GUKt8qq77pfuzRDx-JKIVg6BMP8,56100
+coverage/control.py,sha256=oPZYE10LjV5gJtTEVrhb5hAARXO5DkFJLbxpZu-AF90,56087
 coverage/core.py,sha256=FgNbMrDRj9_ETraUQLjx3baRaUnpmb4CAW32S1DCUqg,4477
 coverage/data.py,sha256=WuNUTfXoytulNWHA-F1OnSfvqu0DgSN7tg9R4ow2CjA,8352
-coverage/debug.py,sha256=rSJ9rbZzNj6KIZslUR3VQ2YUBTfWdK7aG3cgH87d_1U,22207
+coverage/debug.py,sha256=rY7n6UYRtIaWjC1Wn764AfH8XjYrvJB3XZcvQAH-bNs,22235
 coverage/disposition.py,sha256=eZmBzTPMmLkDi5OLRNrqtJQMZ4XXh4sHrP1xPEZ50D8,1954
-coverage/env.py,sha256=sbWgpZKO8xzXtQP6_RRPSCEjMFBbDUc5A3y1tqfQW8s,7610
-coverage/exceptions.py,sha256=tSV5ajKEhCEy4G-ZGMy1sxI-sJG26HMVwjJyJzirX-0,1631
+coverage/env.py,sha256=-QCJcrE6UoJmUzO_3shtviXViblPiYEBEmb6vgrpq0c,5105
+coverage/exceptions.py,sha256=SM3t24dubPw7bB1oAjo2t3M2B-kaJWBudoYsuGX-v4c,1502
 coverage/execfile.py,sha256=TSqB02-3aCYLqPe_ELpD91Y29UVi7EwOLrkTZsZ4pFg,12320
 coverage/files.py,sha256=xXp40_DeEM8oUd-EEtUcvK24YHTxmiHCfhfcgeOTQxc,19908
 coverage/html.py,sha256=9oO7s6BHzoHNaYCldJ_k9oFD4TIMDd0x4wH_jXJaSUw,32238
 coverage/inorout.py,sha256=HbNb7xIolXGyXtohzwgDQCLrO4HkFnGo5oCvws2lqmY,24957
 coverage/jsonreport.py,sha256=wZgntJY2uApDvAdpnNPcrwNvmyb3Tc4XK3fN5L2Opf0,7255
 coverage/lcovreport.py,sha256=OmqTh9rQ2GaIRYADx_3OOhmfZOoG_ocPqbOB9j7Kp_A,8091
-coverage/misc.py,sha256=xytcM5j7NDwhWPB8jdWMwqmiEy8fImMLUZExm1eSPOw,11608
+coverage/misc.py,sha256=pvDaKapNAHzE76UaHRqsJuhhmMhgXBJLAYKwEIOwPkI,11662
 coverage/multiproc.py,sha256=PpThtQg0j9NHlYpceNxx5wg9O4XdOjjt03jlI2rkfwI,4293
 coverage/numbits.py,sha256=t7XK_d-I-tVZgRS2M3Y5PG0Pq017D3rvecSipBsT_CA,4817
-coverage/parser.py,sha256=oQDSOwjbyYxpf-6LZhFFmum1WmgKrwz1S-WCkPnnmN8,53500
-coverage/patch.py,sha256=tcw8V58zIgDdm-cyMmgtAjNaHhOZQkuJuYmIQ91fD_M,5701
-coverage/phystokens.py,sha256=enBRdptUw3gxDGLfgrxqtCR0gTRQzJU-AkHZU-pd4uA,7795
+coverage/parser.py,sha256=vP552qMlBqw-uUwA8Vbf8Cv4W37CxP8BH-3owuojqHg,47437
+coverage/patch.py,sha256=3GHFJnl1scWtvRVhFp2-qPHdAcF8Ve44vdl8xl3C7Oo,5731
+coverage/phystokens.py,sha256=QYlZQBB343TW7SRHhaeo6AoKr9abhMCFjSC4c6aLg3Y,7645
 coverage/plugin.py,sha256=sWFPqm3JrMLRrRNZryP3WmRi3VbGBmCWol9cKEKFYas,22124
 coverage/plugin_support.py,sha256=DWcHXg2Gde0r5XH68sxygXpLGcMlp8H6zDhNOKg6Wc4,10741
 coverage/py.typed,sha256=QhKiyYY18iX2PTjtgwSYebGpYvH_m0bYEyU_kMST7EU,73
@@ -39,10 +39,10 @@ coverage/sqlitedb.py,sha256=7MmRxX7alrq-Elzx5TzJJNi6xURwUH5mX2Pvgr_Qnp8,10249
 coverage/sysmon.py,sha256=u3Oek5ToXFSwjy_x9zOymOWFznRFPT0YxIXyou_QU_Y,17965
 coverage/templite.py,sha256=ETQ1TTufhLF6qlS2kuaX9gg7iQ-c0V6hTlGcInJ0dWA,11116
 coverage/tomlconfig.py,sha256=GtiVV3RzKwj5Z6-RSL8XZFSO5iLfj97dcvqpODkw5Ek,7766
-coverage/tracer.cp313-win_arm64.pyd,sha256=15cNd2t28n6nnkZtHBAw8n55IwFnhMUmgojXHFjvWaU,22016
+coverage/tracer.cp313-win_arm64.pyd,sha256=jqGCgYg9Lsp09kpFcRkZ0PUTRM0IUrwNFkeeUT7RWZE,22016
 coverage/tracer.pyi,sha256=e1YXvQg8IuQaaoP7Tj25It3pNAtv0Mt29DwwxO4KfaM,1248
-coverage/types.py,sha256=dUQ91LEjNe3e4WHI1bzNYdTMKy_axXgVPU84mPzFMp0,5971
-coverage/version.py,sha256=pERk5JGxocE8y6JQWede_XNJx6IKyUzeF_PJBsZFYZE,1127
+coverage/types.py,sha256=0f03sJRwr4TZItHwZPHNFxL5bhjU1B3ye8C1BVQaUPc,5804
+coverage/version.py,sha256=S45hpB6zMbJnEW8jDIl4pxGE0QjLTKTOJvk5DUXNmhc,1127
 coverage/xmlreport.py,sha256=Wha1LxJgIEqKPO2hVqywTDt3QfPNtk4bgHqxBnog-mA,10133
 coverage/htmlfiles/coverage_html.js,sha256=PqDTAlVdIaB9gIjEf6JHHysMm_D7HyRe4BzQFfpf3OM,26207
 coverage/htmlfiles/favicon_32.png,sha256=vIEA-odDwRvSQ-syWfSwEnWGUWEv2b-Tv4tzTRfwJWE,1732
@@ -51,9 +51,9 @@ coverage/htmlfiles/keybd_closed.png,sha256=fZv4rmY3DkNJtPQjrFJ5UBOE5DdNof3mdeCZW
 coverage/htmlfiles/pyfile.html,sha256=dJV8bc3mMQz6J_N2KxVMXNKVge6vnMiQiqqe1QYuZmw,6643
 coverage/htmlfiles/style.css,sha256=DoE2sbDGB3s5ZrE9QCbgKivfw-HcpTRvtMeXbJn7EjA,16020
 coverage/htmlfiles/style.scss,sha256=ZjH-qCU3X7wrMfepdUhqyYc8gXaqBz6n_M9hTMU93Kw,21737
-coverage-7.10.7.dist-info/licenses/LICENSE.txt,sha256=6z17VIVGasvYHytJb1latjfSeS4mggayfZnnk722dUk,10351
-coverage-7.10.7.dist-info/METADATA,sha256=F05SGumr40ekQm0ZChZml8R46PpqE-NlcWrMn-T2wqc,9155
-coverage-7.10.7.dist-info/WHEEL,sha256=QL7uMKXoDJRpSwAf1VOVpjVXYPYll2YWTJ-omqdO8-4,101
-coverage-7.10.7.dist-info/entry_points.txt,sha256=pnhoSeaPIYrhkvLFbNNfBlAf4ROp08ys-4Bzf9zNz1o,123
-coverage-7.10.7.dist-info/top_level.txt,sha256=BjhyiIvusb5OJkqCXjRncTF3soKF-mDOby-hxkWwwv0,9
-coverage-7.10.7.dist-info/RECORD,,
+coverage-7.11.0.dist-info/licenses/LICENSE.txt,sha256=6z17VIVGasvYHytJb1latjfSeS4mggayfZnnk722dUk,10351
+coverage-7.11.0.dist-info/METADATA,sha256=zNoryzJsdBM_IZJaCVbnOeYW3SizS9bM6TLvHBI_l4s,9178
+coverage-7.11.0.dist-info/WHEEL,sha256=QL7uMKXoDJRpSwAf1VOVpjVXYPYll2YWTJ-omqdO8-4,101
+coverage-7.11.0.dist-info/entry_points.txt,sha256=pnhoSeaPIYrhkvLFbNNfBlAf4ROp08ys-4Bzf9zNz1o,123
+coverage-7.11.0.dist-info/top_level.txt,sha256=BjhyiIvusb5OJkqCXjRncTF3soKF-mDOby-hxkWwwv0,9
+coverage-7.11.0.dist-info/RECORD,,