coverage 7.10.6__cp313-cp313-musllinux_1_2_aarch64.whl → 7.11.0__cp313-cp313-musllinux_1_2_aarch64.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,9 +1139,11 @@ 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:
+            msg = f"{msg.rstrip('.')}; see {__url__}/messages.html#error-{err.slug}"
         print(msg)
         status = ERR
     except SystemExit as err:

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.
@@ -568,7 +568,7 @@ class CoverageConfig(TConfigurable, TPluginConfig):
         return human_sorted_items((k, v) for k, v in self.__dict__.items() if not k.startswith("_"))
 
     def serialize(self) -> str:
-        """Convert to a string that can be ingested with `deserialize_config`.
+        """Convert to a string that can be ingested with `deserialize`.
 
         File paths used by `coverage run` are made absolute to ensure the
         deserialized config will refer to the same files.
@@ -584,6 +584,14 @@ class CoverageConfig(TConfigurable, TPluginConfig):
             data[k] = v
         return base64.b64encode(json.dumps(data).encode()).decode()
 
+    @classmethod
+    def deserialize(cls, config_str: str) -> CoverageConfig:
+        """Take a string from `serialize`, and make a CoverageConfig."""
+        data = json.loads(base64.b64decode(config_str.encode()).decode())
+        config = cls()
+        config.__dict__.update(data)
+        return config
+
 
 def process_file_value(path: str) -> str:
     """Make adjustments to a file path to make it usable."""
@@ -707,11 +715,3 @@ def read_coverage_config(
     config.post_process()
 
     return config
-
-
-def deserialize_config(config_str: str) -> CoverageConfig:
-    """Take a string from CoverageConfig.serialize, and make a CoverageConfig."""
-    data = json.loads(base64.b64decode(config_str.encode()).decode())
-    config = CoverageConfig()
-    config.__dict__.update(data)
-    return config

coverage/control.py

@@ -19,12 +19,12 @@ 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
 from coverage.collector import Collector
-from coverage.config import CoverageConfig, deserialize_config, read_coverage_config
+from coverage.config import CoverageConfig, read_coverage_config
 from coverage.context import combine_context_switchers, should_start_context_test_function
 from coverage.core import CTRACER_FILE, Core
 from coverage.data import CoverageData, combine_parallel_data
@@ -67,6 +67,7 @@ from coverage.types import (
     TLineNo,
     TMorf,
 )
+from coverage.version import __url__
 from coverage.xmlreport import XmlReporter
 
 os = isolate_module(os)
@@ -297,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
@@ -320,7 +321,7 @@ class Coverage(TConfigurable):
 
         # Build our configuration from a number of sources.
         if isinstance(config_file, str) and config_file.startswith(CONFIG_DATA_PREFIX):
-            self.config = deserialize_config(config_file[len(CONFIG_DATA_PREFIX) :])
+            self.config = CoverageConfig.deserialize(config_file[len(CONFIG_DATA_PREFIX) :])
         else:
             if not isinstance(config_file, bool):
                 config_file = os.fspath(config_file)
@@ -479,7 +480,7 @@ class Coverage(TConfigurable):
 
         self._warnings.append(msg)
         if slug:
-            msg = f"{msg} ({slug})"
+            msg = f"{msg} ({slug}); see {__url__}/messages.html#warning-{slug}"
         if self._debug.should("pid"):
             msg = f"[{os.getpid()}] {msg}"
         warnings.warn(msg, category=CoverageWarning, stacklevel=2)

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

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

coverage/html.py

@@ -32,7 +32,7 @@ from coverage.misc import (
     stdout_link,
 )
 from coverage.report_core import get_analysis_to_report
-from coverage.results import Analysis, Numbers
+from coverage.results import Analysis, AnalysisNarrower, Numbers
 from coverage.templite import Templite
 from coverage.types import TLineNo, TMorf
 from coverage.version import __url__
@@ -582,13 +582,21 @@ class HtmlReporter:
 
             for noun in region_nouns:
                 page_data = self.index_pages[noun]
-                outside_lines = set(range(1, num_lines + 1))
 
+                outside_lines = set(range(1, num_lines + 1))
                 for region in regions:
                     if region.kind != noun:
                         continue
                     outside_lines -= region.lines
-                    analysis = ftr.analysis.narrow(region.lines)
+
+                narrower = AnalysisNarrower(ftr.analysis)
+                narrower.add_regions(r.lines for r in regions if r.kind == noun)
+                narrower.add_regions([outside_lines])
+
+                for region in regions:
+                    if region.kind != noun:
+                        continue
+                    analysis = narrower.narrow(region.lines)
                     if not self.should_report(analysis, page_data):
                         continue
                     sorting_name = region.name.rpartition(".")[-1].lstrip("_")
@@ -605,7 +613,7 @@ class HtmlReporter:
                         )
                     )
 
-                analysis = ftr.analysis.narrow(outside_lines)
+                analysis = narrower.narrow(outside_lines)
                 if self.should_report(analysis, page_data):
                     page_data.summaries.append(
                         IndexItem(

coverage/jsonreport.py

@@ -13,7 +13,7 @@ from typing import IO, TYPE_CHECKING, Any
 
 from coverage import __version__
 from coverage.report_core import get_analysis_to_report
-from coverage.results import Analysis, Numbers
+from coverage.results import Analysis, AnalysisNarrower, Numbers
 from coverage.types import TLineNo, TMorf
 
 if TYPE_CHECKING:
@@ -128,21 +128,30 @@ class JsonReporter:
             )
 
         num_lines = len(file_reporter.source().splitlines())
+        regions = file_reporter.code_regions()
         for noun, plural in file_reporter.code_region_kinds():
-            reported_file[plural] = region_data = {}
             outside_lines = set(range(1, num_lines + 1))
-            for region in file_reporter.code_regions():
+            for region in regions:
                 if region.kind != noun:
                     continue
                 outside_lines -= region.lines
+
+            narrower = AnalysisNarrower(analysis)
+            narrower.add_regions(r.lines for r in regions if r.kind == noun)
+            narrower.add_regions([outside_lines])
+
+            reported_file[plural] = region_data = {}
+            for region in regions:
+                if region.kind != noun:
+                    continue
                 region_data[region.name] = self.make_region_data(
                     coverage_data,
-                    analysis.narrow(region.lines),
+                    narrower.narrow(region.lines),
                 )
 
             region_data[""] = self.make_region_data(
                 coverage_data,
-                analysis.narrow(outside_lines),
+                narrower.narrow(outside_lines),
             )
         return reported_file
 

coverage/lcovreport.py

@@ -13,7 +13,7 @@ from typing import IO, TYPE_CHECKING
 
 from coverage.plugin import FileReporter
 from coverage.report_core import get_analysis_to_report
-from coverage.results import Analysis, Numbers
+from coverage.results import Analysis, AnalysisNarrower, Numbers
 from coverage.types import TMorf
 
 if TYPE_CHECKING:
@@ -81,12 +81,15 @@ def lcov_functions(
     if not functions:
         return
 
+    narrower = AnalysisNarrower(file_analysis)
+    narrower.add_regions(r.lines for _, _, r in functions)
+
     functions.sort()
     functions_hit = 0
     for first_line, last_line, region in functions:
         # A function counts as having been executed if any of it has been
         # executed.
-        analysis = file_analysis.narrow(region.lines)
+        analysis = narrower.narrow(region.lines)
         hit = int(analysis.numbers.n_executed > 0)
         functions_hit += hit
 

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: