diff --git a/ports/RetroBIOS/retrobios/rbevents.py b/ports/RetroBIOS/retrobios/rbevents.py index 47bfbee5..9c7e8597 100644 --- a/ports/RetroBIOS/retrobios/rbevents.py +++ b/ports/RetroBIOS/retrobios/rbevents.py @@ -24,7 +24,7 @@ from typing import Iterable, Iterator, TextIO _UNSAFE = re.compile(r"[\x00-\x1f\x7f*?\[\]\\]+") _SPACES = re.compile(r" {2,}") # A system id becomes a bash array subscript and a menu key in the launcher. -# Every manifest uses slugs; anything else is dropped, never cleaned into one. +# Every manifest uses slugs, and anything else is dropped, never cleaned into one. _SYSTEM_ID = re.compile(r"[A-Za-z0-9._-]+") diff --git a/scripts/generate_site.py b/scripts/generate_site.py index b333c9c5..740ccd40 100644 --- a/scripts/generate_site.py +++ b/scripts/generate_site.py @@ -2067,13 +2067,13 @@ def _category_evidence_md(evidence: dict) -> str: readers = [] for reader in evidence["read_by"]: refs = [ - f"`{e['name']}` (`{e['source_ref']}`)" if e.get("source_ref") else f"`{e['name']}`" + f"`{e['name']}` at `{e['source_ref']}`" if e.get("source_ref") else f"`{e['name']}`" for e in reader.get("entries", []) ] name = (_emulator_link(reader["emulator"], "../") if reader["emulator"] != "launcher" else "the platform's launcher") - readers.append(f"{name}: {', '.join(refs)}" if refs else f"{name} (by {reader['proof']})") - return "Read by " + "; ".join(readers) + readers.append(f"{name} ({', '.join(refs)})" if refs else f"{name} (by {reader['proof']})") + return "Read by " + ", ".join(readers) examined = evidence.get("cores_examined") or [] cores = ("cores examined: " + ", ".join(_emulator_link(c, "../") for c in examined) if examined else "no core examined") diff --git a/scripts/verify.py b/scripts/verify.py index 4d856f08..b080f7f7 100644 --- a/scripts/verify.py +++ b/scripts/verify.py @@ -1637,14 +1637,14 @@ def category_evidence_text(evidence: dict) -> str: readers = [] for reader in evidence["read_by"]: refs = [ - f"{e['name']} ({e['source_ref']})" if e.get("source_ref") else e["name"] + f"{e['name']} at {e['source_ref']}" if e.get("source_ref") else e["name"] for e in reader.get("entries", []) ] readers.append( - f"{reader['emulator']}: {', '.join(refs)}" if refs + f"{reader['emulator']} ({', '.join(refs)})" if refs else f"{reader['emulator']} (by {reader['proof']})" ) - return "read by " + "; ".join(readers) + return "read by " + ", ".join(readers) examined = evidence.get("cores_examined") or [] cores = f"cores examined: {', '.join(examined)}" if examined else "no core examined" if evidence.get("unsettled"): @@ -1682,7 +1682,7 @@ def _print_detail_entries(details: list[dict], seen: set[str], verbose: bool) -> continue label = _NOT_FIRMWARE.get(d.get("category", BIOS)) if label: - # Counted on their own line; named on request. + # Counted on their own line, named on request. if verbose: seen.add(key) print(f" MISSING ({label}): {key}") diff --git a/tests/test_e2e.py b/tests/test_e2e.py index c744c2e5..3c7d1e02 100644 --- a/tests/test_e2e.py +++ b/tests/test_e2e.py @@ -5270,7 +5270,7 @@ struct BurnDriver BurnDrvneogeo = { def test_213b_absent_game_data_is_counted_apart(self): """Game data the collection lacks is counted apart from the pack's - errors; firmware the collection lacks stays one.""" + errors, while firmware the collection lacks stays one.""" import tempfile from generate_pack import generate_pack, verify_pack_against_platform diff --git a/tests/test_entry_categories.py b/tests/test_entry_categories.py index 1ca8ebea..c14b5735 100644 --- a/tests/test_entry_categories.py +++ b/tests/test_entry_categories.py @@ -85,7 +85,7 @@ class Evidence(unittest.TestCase): "emulator": "devilutionx", "proof": "name", "entries": [{"name": "diabdat.mpq", "source_ref": "Source/init.cpp:120"}]}]) self.assertEqual(verify.category_evidence_text(found), - "read by devilutionx: diabdat.mpq (Source/init.cpp:120)") + "read by devilutionx (diabdat.mpq at Source/init.cpp:120)") def test_unread_names_the_cores_examined(self): found = self.cats.explain({"name": "hardwareconfig.xml"}, diff --git a/tests/test_pack_core_extras.py b/tests/test_pack_core_extras.py index 14cacd04..d997b8b9 100644 --- a/tests/test_pack_core_extras.py +++ b/tests/test_pack_core_extras.py @@ -73,7 +73,7 @@ class CoreFilesAsTheBuilderPlacesThem(unittest.TestCase): ) def test_a_path_the_platform_file_holds_is_not_a_core_file(self): - ok, _checked, _present, errors, _bc, _bp, core_checked, core_present, _ex = ( + ok, _checked, _present, errors, _bc, _bp, core_checked, core_present, _ex, _absent = ( self._check(b"core file") ) self.assertTrue(ok, errors) diff --git a/tests/test_verify_pack_choice.py b/tests/test_verify_pack_choice.py index 9ead675d..0f243da4 100644 --- a/tests/test_verify_pack_choice.py +++ b/tests/test_verify_pack_choice.py @@ -22,7 +22,7 @@ sys.path.insert(0, str(REPO_ROOT / "scripts")) def _ok_result() -> tuple: - return (True, 0, 0, [], 1, 1, 1, 1, 0) + return (True, 0, 0, [], 1, 1, 1, 1, 0, 0) class VerifyPackChoice(unittest.TestCase): @@ -125,7 +125,7 @@ class VerifyPackChoice(unittest.TestCase): pack = f"{self.stem}_BIOS_Pack.zip" self._touch(pack) out, err = io.StringIO(), io.StringIO() - failed = (False, 0, 0, ["x: missing"], 1, 0, 1, 1, 0) + failed = (False, 0, 0, ["x: missing"], 1, 0, 1, 1, 0, 0) with mock.patch.object(self.gp, "verify_pack_against_platform", return_value=failed), \ contextlib.redirect_stdout(out), contextlib.redirect_stderr(err), \