coverage 7.6.10__cp312-cp312-musllinux_1_2_aarch64.whl → 7.12.0__cp312-cp312-musllinux_1_2_aarch64.whl

coverage/html.py

@@ -1,5 +1,5 @@
 # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
+# For details: https://github.com/coveragepy/coveragepy/blob/main/NOTICE.txt
 
 """HTML reporting for coverage.py."""
 
@@ -13,26 +13,30 @@ import json
 import os
 import re
 import string
-
-from dataclasses import dataclass, field
-from typing import Any, TYPE_CHECKING
 from collections.abc import Iterable
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING, Any
 
 import coverage
 from coverage.data import CoverageData, add_data_to_hash
 from coverage.exceptions import NoDataError
 from coverage.files import flat_rootname
 from coverage.misc import (
-    ensure_dir, file_be_gone, Hasher, isolate_module, format_local_datetime,
-    human_sorted, plural, stdout_link,
+    Hasher,
+    ensure_dir,
+    file_be_gone,
+    format_local_datetime,
+    human_sorted,
+    isolate_module,
+    plural,
+    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__
 
-
 if TYPE_CHECKING:
     from coverage import Coverage
     from coverage.plugins import FileReporter
@@ -42,8 +46,7 @@ os = isolate_module(os)
 
 
 def data_filename(fname: str) -> str:
-    """Return the path to an "htmlfiles" data file of ours.
-    """
+    """Return the path to an "htmlfiles" data file of ours."""
     static_dir = os.path.join(os.path.dirname(__file__), "htmlfiles")
     static_filename = os.path.join(static_dir, fname)
     return static_filename
@@ -51,7 +54,7 @@ def data_filename(fname: str) -> str:
 
 def read_data(fname: str) -> str:
     """Return the contents of a data file of ours."""
-    with open(data_filename(fname)) as data_file:
+    with open(data_filename(fname), encoding="utf-8") as data_file:
         return data_file.read()
 
 
@@ -65,6 +68,7 @@ def write_html(fname: str, html: str) -> None:
 @dataclass
 class LineData:
     """The data for each source line of HTML output."""
+
     tokens: list[tuple[str, str]]
     number: TLineNo
     category: str
@@ -83,6 +87,7 @@ class LineData:
 @dataclass
 class FileData:
     """The data for each source file of HTML output."""
+
     relative_filename: str
     nums: Numbers
     lines: list[LineData]
@@ -91,6 +96,7 @@ class FileData:
 @dataclass
 class IndexItem:
     """Information for each index entry, to render an index page."""
+
     url: str = ""
     file: str = ""
     description: str = ""
@@ -100,6 +106,7 @@ class IndexItem:
 @dataclass
 class IndexPage:
     """Data for each index page."""
+
     noun: str
     plural: str
     filename: str
@@ -138,10 +145,13 @@ class HtmlDataGeneration:
 
         lines = []
         branch_stats = analysis.branch_stats()
+        multiline_map = {}
+        if hasattr(fr, "multiline_map"):
+            multiline_map = fr.multiline_map()
 
         for lineno, tokens in enumerate(fr.source_token_lines(), start=1):
             # Figure out how to mark this line.
-            category = ""
+            category = category2 = ""
             short_annotations = []
             long_annotations = []
 
@@ -169,6 +179,18 @@ class HtmlDataGeneration:
                         )
             elif lineno in analysis.statements:
                 category = "run"
+            elif first_line := multiline_map.get(lineno):
+                if first_line in analysis.excluded:
+                    category2 = "exc2"
+                elif first_line in analysis.missing:
+                    category2 = "mis2"
+                elif self.has_arcs and first_line in missing_branch_arcs:
+                    category2 = "par2"
+                # I don't understand why this last condition is marked as
+                # partial.  If I add an else with an exception, the exception
+                # is raised.
+                elif first_line in analysis.statements:  # pragma: part covered
+                    category2 = "run2"
 
             contexts = []
             contexts_label = ""
@@ -181,16 +203,18 @@ class HtmlDataGeneration:
                     contexts_label = f"{len(contexts)} ctx"
                     context_list = contexts
 
-            lines.append(LineData(
-                tokens=tokens,
-                number=lineno,
-                category=category,
-                contexts=contexts,
-                contexts_label=contexts_label,
-                context_list=context_list,
-                short_annotations=short_annotations,
-                long_annotations=long_annotations,
-            ))
+            lines.append(
+                LineData(
+                    tokens=tokens,
+                    number=lineno,
+                    category=category or category2,
+                    contexts=contexts,
+                    contexts_label=contexts_label,
+                    context_list=context_list,
+                    short_annotations=short_annotations,
+                    long_annotations=long_annotations,
+                )
+            )
 
         file_data = FileData(
             relative_filename=fr.relative_filename(),
@@ -203,6 +227,7 @@ class HtmlDataGeneration:
 
 class FileToReport:
     """A file we're considering reporting."""
+
     def __init__(self, fr: FileReporter, analysis: Analysis) -> None:
         self.fr = fr
         self.analysis = analysis
@@ -213,6 +238,7 @@ class FileToReport:
 
 HTML_SAFE = string.ascii_letters + string.digits + "!#$%'()*+,-./:;=?@[]^_`{|}~"
 
+
 @functools.cache
 def encode_int(n: int) -> str:
     """Create a short HTML-safe string from an integer, using HTML_SAFE."""
@@ -287,8 +313,7 @@ class HtmlReporter:
             # Functions available in the templates.
             "escape": escape,
             "pair": pair,
-            "len": len,
-
+            "pretty_file": pretty_file,
             # Constants for this report.
             "__url__": __url__,
             "__version__": coverage.__version__,
@@ -296,9 +321,7 @@ class HtmlReporter:
             "time_stamp": format_local_datetime(datetime.datetime.now()),
             "extra_css": self.extra_css,
             "has_arcs": self.has_arcs,
-            "show_contexts": self.config.show_contexts,
             "statics": {},
-
             # Constants for all reports.
             # These css classes determine which lines are highlighted by default.
             "category": {
@@ -306,6 +329,10 @@ class HtmlReporter:
                 "mis": "mis show_mis",
                 "par": "par run show_par",
                 "run": "run",
+                "exc2": "exc exc2 show_exc",
+                "mis2": "mis mis2 show_mis",
+                "par2": "par par2 ru2 show_par",
+                "run2": "run run2",
             },
         }
         self.index_tmpl = Templite(read_data("index.html"), self.template_globals)
@@ -394,7 +421,7 @@ class HtmlReporter:
         dest = copy_with_cache_bust(src, self.directory)
         if not slug:
             slug = os.path.basename(src).replace(".", "_")
-        self.template_globals["statics"][slug] = dest # type: ignore
+        self.template_globals["statics"][slug] = dest  # type: ignore
 
     def make_local_static_report_files(self) -> None:
         """Make local instances of static files for HTML report."""
@@ -412,7 +439,7 @@ class HtmlReporter:
         # .gitignore can't be copied from the source tree because if it was in
         # the source tree, it would stop the static files from being checked in.
         if self.directory_was_empty:
-            with open(os.path.join(self.directory, ".gitignore"), "w") as fgi:
+            with open(os.path.join(self.directory, ".gitignore"), "w", encoding="utf-8") as fgi:
                 fgi.write("# Created by coverage.py\n*\n")
 
     def should_report(self, analysis: Analysis, index_page: IndexPage) -> bool:
@@ -423,8 +450,8 @@ class HtmlReporter:
 
         if self.skip_covered:
             # Don't report on 100% files.
-            no_missing_lines = (nums.n_missing == 0)
-            no_missing_branches = (nums.n_partial_branches == 0)
+            no_missing_lines = (nums.n_missing == 0)  # fmt: skip
+            no_missing_branches = (nums.n_partial_branches == 0)  # fmt: skip
             if no_missing_lines and no_missing_branches:
                 index_page.skipped_covered_count += 1
                 return False
@@ -478,9 +505,8 @@ class HtmlReporter:
                     encode_int(context_codes[c_context]) for c_context in ldata.context_list
                 ]
                 code_width = max(len(ec) for ec in encoded_contexts)
-                ldata.context_str = (
-                    str(code_width)
-                    + "".join(ec.ljust(code_width) for ec in encoded_contexts)
+                ldata.context_str = str(code_width) + "".join(
+                    ec.ljust(code_width) for ec in encoded_contexts
                 )
             else:
                 ldata.context_str = ""
@@ -489,8 +515,7 @@ class HtmlReporter:
                 # 202F is NARROW NO-BREAK SPACE.
                 # 219B is RIGHTWARDS ARROW WITH STROKE.
                 ldata.annotate = ",   ".join(
-                    f"{ldata.number} ↛ {d}"
-                    for d in ldata.short_annotations
+                    f"{ldata.number} ↛ {d}" for d in ldata.short_annotations
                 )
             else:
                 ldata.annotate = None
@@ -509,24 +534,26 @@ class HtmlReporter:
             css_classes = []
             if ldata.category:
                 css_classes.append(
-                    self.template_globals["category"][ldata.category],   # type: ignore[index]
+                    self.template_globals["category"][ldata.category],  # type: ignore[index]
                 )
             ldata.css_class = " ".join(css_classes) or "pln"
 
         html_path = os.path.join(self.directory, ftr.html_filename)
-        html = self.source_tmpl.render({
-            **file_data.__dict__,
-            "contexts_json": contexts_json,
-            "prev_html": ftr.prev_html,
-            "next_html": ftr.next_html,
-        })
+        html = self.source_tmpl.render(
+            {
+                **file_data.__dict__,
+                "contexts_json": contexts_json,
+                "prev_html": ftr.prev_html,
+                "next_html": ftr.next_html,
+            }
+        )
         write_html(html_path, html)
 
         # Save this file's information for the index page.
         index_info = IndexItem(
-            url = ftr.html_filename,
-            file = escape(ftr.fr.relative_filename()),
-            nums = ftr.analysis.numbers,
+            url=ftr.html_filename,
+            file=escape(ftr.fr.relative_filename()),
+            nums=ftr.analysis.numbers,
         )
         self.index_pages["file"].summaries.append(index_info)
         self.incr.set_index_info(ftr.rootname, index_info)
@@ -554,39 +581,51 @@ 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("_")
-                    page_data.summaries.append(IndexItem(
-                        url=f"{ftr.html_filename}#t{region.start}",
-                        file=escape(ftr.fr.relative_filename()),
-                        description=(
-                            f"<data value='{escape(sorting_name)}'>"
-                            + escape(region.name)
-                            + "</data>"
-                        ),
-                        nums=analysis.numbers,
-                    ))
-
-                analysis = ftr.analysis.narrow(outside_lines)
+                    page_data.summaries.append(
+                        IndexItem(
+                            url=f"{ftr.html_filename}#t{region.start}",
+                            file=escape(ftr.fr.relative_filename()),
+                            description=(
+                                f"<data value='{escape(sorting_name)}'>"
+                                + escape(region.name)
+                                + "</data>"
+                            ),
+                            nums=analysis.numbers,
+                        )
+                    )
+
+                analysis = narrower.narrow(outside_lines)
                 if self.should_report(analysis, page_data):
-                    page_data.summaries.append(IndexItem(
-                        url=ftr.html_filename,
-                        file=escape(ftr.fr.relative_filename()),
-                        description=(
-                            "<data value=''>"
-                            + f"<span class='no-noun'>(no {escape(noun)})</span>"
-                            + "</data>"
-                        ),
-                        nums=analysis.numbers,
-                    ))
+                    page_data.summaries.append(
+                        IndexItem(
+                            url=ftr.html_filename,
+                            file=escape(ftr.fr.relative_filename()),
+                            description=(
+                                "<data value=''>"
+                                + f"<span class='no-noun'>(no {escape(noun)})</span>"
+                                + "</data>"
+                            ),
+                            nums=analysis.numbers,
+                        )
+                    )
 
         for noun, index_page in self.index_pages.items():
             if noun != "file":
@@ -636,6 +675,7 @@ class HtmlReporter:
 @dataclass
 class FileInfo:
     """Summary of the information from last rendering, to avoid duplicate work."""
+
     hash: str = ""
     index: IndexItem = field(default_factory=IndexItem)
 
@@ -706,7 +746,7 @@ class IncrementalChecker:
         """Read the information we stored last time."""
         try:
             status_file = os.path.join(self.directory, self.STATUS_FILE)
-            with open(status_file) as fstatus:
+            with open(status_file, encoding="utf-8") as fstatus:
                 status = json.load(fstatus)
         except (OSError, ValueError):
             # Status file is missing or malformed.
@@ -742,12 +782,9 @@ class IncrementalChecker:
             "format": self.STATUS_FORMAT,
             "version": coverage.__version__,
             "globals": self.globals,
-            "files": {
-                fname: dataclasses.asdict(finfo)
-                for fname, finfo in self.files.items()
-            },
+            "files": {fname: dataclasses.asdict(finfo) for fname, finfo in self.files.items()},
         }
-        with open(status_file, "w") as fout:
+        with open(status_file, "w", encoding="utf-8") as fout:
             json.dump(status_data, fout, separators=(",", ":"))
 
     def check_global_data(self, *data: Any) -> None:
@@ -802,6 +839,7 @@ class IncrementalChecker:
 
 # Helpers for templates and generating HTML
 
+
 def escape(t: str) -> str:
     """HTML-escape the text in `t`.
 
@@ -815,3 +853,8 @@ def escape(t: str) -> str:
 def pair(ratio: tuple[int, int]) -> str:
     """Format a pair of numbers so JavaScript can read them in an attribute."""
     return "{} {}".format(*ratio)
+
+
+def pretty_file(filename: str) -> str:
+    """Return a prettier version of `filename` for display."""
+    return re.sub(r"[/\\]", "\N{THIN SPACE}\\g<0>\N{THIN SPACE}", filename)

coverage/htmlfiles/coverage_html.js

@@ -1,5 +1,5 @@
 // Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-// For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
+// For details: https://github.com/coveragepy/coveragepy/blob/main/NOTICE.txt
 
 // Coverage.py HTML report browser code.
 /*jslint browser: true, sloppy: true, vars: true, plusplus: true, maxerr: 50, indent: 4 */
@@ -140,12 +140,15 @@ coverage.wire_up_filter = function () {
     const table_body_rows = table.querySelectorAll("tbody tr");
     const no_rows = document.getElementById("no_rows");
 
+    const footer = table.tFoot.rows[0];
+    const ratio_columns = Array.from(footer.cells).map(cell => Boolean(cell.dataset.ratio));
+
     // Observe filter keyevents.
     const filter_handler = (event => {
         // Keep running total of each metric, first index contains number of shown rows
-        const totals = new Array(table.rows[0].cells.length).fill(0);
-        // Accumulate the percentage as fraction
-        totals[totals.length - 1] = { "numer": 0, "denom": 0 };  // nosemgrep: eslint.detect-object-injection
+        const totals = ratio_columns.map(
+            is_ratio => is_ratio ? {"numer": 0, "denom": 0} : 0
+        );
 
         var text = document.getElementById("filter").value;
         // Store filter value
@@ -191,11 +194,11 @@ coverage.wire_up_filter = function () {
             for (let column = 0; column < totals.length; column++) {
                 // Accumulate dynamic totals
                 cell = row.cells[column]  // nosemgrep: eslint.detect-object-injection
-                if (cell.classList.contains("name")) {
+                if (cell.matches(".name, .spacer")) {
                     continue;
                 }
-                if (column === totals.length - 1) {
-                    // Last column contains percentage
+                if (ratio_columns[column] && cell.dataset.ratio) {
+                    // Column stores a ratio
                     const [numer, denom] = cell.dataset.ratio.split(" ");
                     totals[column]["numer"] += parseInt(numer, 10);  // nosemgrep: eslint.detect-object-injection
                     totals[column]["denom"] += parseInt(denom, 10);  // nosemgrep: eslint.detect-object-injection
@@ -218,17 +221,16 @@ coverage.wire_up_filter = function () {
         no_rows.style.display = null;
         table.style.display = null;
 
-        const footer = table.tFoot.rows[0];
         // Calculate new dynamic sum values based on visible rows.
         for (let column = 0; column < totals.length; column++) {
             // Get footer cell element.
             const cell = footer.cells[column];  // nosemgrep: eslint.detect-object-injection
-            if (cell.classList.contains("name")) {
+            if (cell.matches(".name, .spacer")) {
                 continue;
             }
 
             // Set value into dynamic footer cell element.
-            if (column === totals.length - 1) {
+            if (ratio_columns[column]) {
                 // Percentage column uses the numerator and denominator,
                 // and adapts to the number of decimal places.
                 const match = /\.([0-9]+)/.exec(cell.textContent);

coverage/htmlfiles/index.html

@@ -1,5 +1,5 @@
 {# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 #}
-{# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt #}
+{# For details: https://github.com/coveragepy/coveragepy/blob/main/NOTICE.txt #}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -81,53 +81,88 @@
     <table class="index" data-sortable>
         <thead>
             {# The title="" attr doesn't work in Safari. #}
+            {% if has_arcs %}
+            <tr class="tablehead grouphead">
+                <th class="spacer">&nbsp;</th>
+                {% if region_noun %}
+                <th class="spacer">&nbsp;</th>
+                {% endif %}
+                <th class="spacer">&nbsp;</th>
+                <th class="left" colspan="{% if has_arcs %}4{% else %}3{% endif %}">Statements</th>
+                <th class="spacer">&nbsp;</th>
+                <th class="left" colspan="3">Branches</th>
+                <th class="spacer">&nbsp;</th>
+                <th>Total</th>
+            </tr>
+            {% endif %}
             <tr class="tablehead" title="Click to sort">
-                <th id="file" class="name left" aria-sort="none" data-shortcut="f">File<span class="arrows"></span></th>
+                <th id="file" class="name" aria-sort="none" data-shortcut="f">File<span class="arrows"></span></th>
                 {% if region_noun %}
-                <th id="region" class="name left" aria-sort="none" data-default-sort-order="ascending" data-shortcut="n">{{ region_noun }}<span class="arrows"></span></th>
+                <th id="region" class="name" aria-sort="none" data-default-sort-order="ascending" data-shortcut="n">{{ region_noun }}<span class="arrows"></span></th>
+                {% endif %}
+                <th class="spacer">&nbsp;</th>
+                {% if has_arcs %}
+                <th id="statements_coverage" aria-sort="none" data-default-sort-order="descending">coverage<span class="arrows"></span></th>
                 {% endif %}
                 <th id="statements" aria-sort="none" data-default-sort-order="descending" data-shortcut="s">statements<span class="arrows"></span></th>
                 <th id="missing" aria-sort="none" data-default-sort-order="descending" data-shortcut="m">missing<span class="arrows"></span></th>
                 <th id="excluded" aria-sort="none" data-default-sort-order="descending" data-shortcut="x">excluded<span class="arrows"></span></th>
                 {% if has_arcs %}
+                <th class="spacer">&nbsp;</th>
+                <th id="branches_coverage" aria-sort="none" data-default-sort-order="descending">coverage<span class="arrows"></span></th>
                 <th id="branches" aria-sort="none" data-default-sort-order="descending" data-shortcut="b">branches<span class="arrows"></span></th>
                 <th id="partial" aria-sort="none" data-default-sort-order="descending" data-shortcut="p">partial<span class="arrows"></span></th>
                 {% endif %}
-                <th id="coverage" class="right" aria-sort="none" data-shortcut="c">coverage<span class="arrows"></span></th>
+                <th class="spacer">&nbsp;</th>
+                <th id="coverage" aria-sort="none" data-shortcut="c">coverage<span class="arrows"></span></th>
             </tr>
         </thead>
         <tbody>
             {% for region in regions %}
             <tr class="region">
-                <td class="name left"><a href="{{region.url}}">{{region.file}}</a></td>
+                <td class="name"><a href="{{region.url}}">{{region.file|escape|pretty_file}}</a></td>
                 {% if region_noun %}
-                <td class="name left"><a href="{{region.url}}">{{region.description}}</a></td>
+                <td class="name"><a href="{{region.url}}">{{region.description}}</a></td>
+                {% endif %}
+                <td class="spacer">&nbsp;</td>
+                {% if has_arcs %}
+                <td data-ratio="{{region.nums.ratio_statements|pair}}">{{region.nums.pc_statements_str}}%</td>
                 {% endif %}
                 <td>{{region.nums.n_statements}}</td>
                 <td>{{region.nums.n_missing}}</td>
                 <td>{{region.nums.n_excluded}}</td>
                 {% if has_arcs %}
+                <td class="spacer">&nbsp;</td>
+                <td data-ratio="{{region.nums.ratio_branches|pair}}">{{region.nums.pc_branches_str}}%</td>
                 <td>{{region.nums.n_branches}}</td>
                 <td>{{region.nums.n_partial_branches}}</td>
                 {% endif %}
-                <td class="right" data-ratio="{{region.nums.ratio_covered|pair}}">{{region.nums.pc_covered_str}}%</td>
+                <td class="spacer">&nbsp;</td>
+                <td data-ratio="{{region.nums.ratio_covered|pair}}">{{region.nums.pc_covered_str}}%</td>
             </tr>
             {% endfor %}
         </tbody>
         <tfoot>
             <tr class="total">
-                <td class="name left">Total</td>
+                <td class="name">Total</td>
                 {% if region_noun %}
-                <td class="name left">&nbsp;</td>
+                <td class="name">&nbsp;</td>
+                {% endif %}
+                <td class="spacer">&nbsp;</td>
+                {% if has_arcs %}
+                <td data-ratio="{{totals.ratio_statements|pair}}">{{totals.pc_statements_str}}%</td>
                 {% endif %}
                 <td>{{totals.n_statements}}</td>
                 <td>{{totals.n_missing}}</td>
                 <td>{{totals.n_excluded}}</td>
                 {% if has_arcs %}
+                <td class="spacer">&nbsp;</td>
+                <td data-ratio="{{totals.ratio_branches|pair}}">{{totals.pc_branches_str}}%</td>
                 <td>{{totals.n_branches}}</td>
                 <td>{{totals.n_partial_branches}}</td>
                 {% endif %}
-                <td class="right" data-ratio="{{totals.ratio_covered|pair}}">{{totals.pc_covered_str}}%</td>
+                <td class="spacer">&nbsp;</td>
+                <td data-ratio="{{totals.ratio_covered|pair}}">{{totals.pc_covered_str}}%</td>
             </tr>
         </tfoot>
     </table>

coverage/htmlfiles/pyfile.html

@@ -1,5 +1,5 @@
 {# Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0 #}
-{# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt #}
+{# For details: https://github.com/coveragepy/coveragepy/blob/main/NOTICE.txt #}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -25,7 +25,7 @@
 <header>
     <div class="content">
         <h1>
-            <span class="text">Coverage for </span><b>{{relative_filename|escape}}</b>:
+            <span class="text">Coverage for </span><b>{{relative_filename|escape|pretty_file}}</b>:
             <span class="pc_cov">{{nums.pc_covered_str}}%</span>
         </h1>