pyDiffTools 0.1.37__tar.gz → 0.1.38__tar.gz

{pydifftools-0.1.37/pyDiffTools.egg-info → pydifftools-0.1.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.37
+Version: 0.1.38
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

{pydifftools-0.1.37 → pydifftools-0.1.38/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.37
+Version: 0.1.38
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

{pydifftools-0.1.37 → pydifftools-0.1.38}/pydifftools/comment_migration.py

@@ -78,7 +78,7 @@ def _most_distant_hue(colors):
     return (start + gap_size / 2) % 360
 
 
-def _migration_dialog(text, colors, legacy):
+def _migration_dialog(filename, colors, legacy):
     """Ask Qt for all migrations and return decisions without editing files."""
     script = r"""
 import colorsys
@@ -95,6 +95,8 @@ from PySide6.QtWidgets import (
 )
 
 payload = json.loads(sys.argv[1])
+with open(sys.argv[2], encoding="utf-8", newline="") as fp:
+    text = fp.read()
 colors = payload["colors"]
 app = QApplication(sys.argv[:1])
 result = {"accepted": True, "replacements": {}, "colors": {}}
@@ -201,9 +203,9 @@ legacy = payload["legacy"]
 if legacy:
     initials = ask_legacy_initials()
     legacy_occurrences = len(re.findall(
-        r"</?comment(?:-(?:left|right))?>", payload["text"], re.I
+        r"</?comment(?:-(?:left|right))?>", text, re.I
     )) + len(re.findall(
-        r"\.comment-(?:left|right)(?=[\s}])", payload["text"], re.I
+        r"\.comment-(?:left|right)(?=[\s}])", text, re.I
     ))
     if initials is None:
         result["accepted"] = False
@@ -222,12 +224,12 @@ if legacy:
 if result["accepted"]:
     authors = sorted(set(
         initials.upper() for initials in re.findall(
-            r"</?([A-Za-z]{2})com(?:-(?:left|right))?>", payload["text"], re.I
+            r"</?([A-Za-z]{2})com(?:-(?:left|right))?>", text, re.I
         )
     ) | set(
         initials.upper() for initials in re.findall(
             r"\.([A-Za-z]{2})com(?:-(?:left|right))?(?=[\s}])",
-            payload["text"], re.I
+            text, re.I
         )
     ))
     if result["replacements"].get("legacy"):
@@ -279,8 +281,10 @@ if result["accepted"]:
 print(json.dumps(result))
 """
     completed = subprocess.run(
+        # the dialog reads the document from its file, since the text of a
+        # large document exceeds the operating system's argument limit
         [sys.executable, "-c", textwrap.dedent(script),
-         json.dumps({"text": text, "colors": colors, "legacy": legacy})],
+         json.dumps({"colors": colors, "legacy": legacy}), filename],
         capture_output=True, text=True,
     )
     if completed.returncode:
@@ -319,7 +323,7 @@ def prepare_comment_source(filename):
     }
     if not has_legacy and authors.issubset(colors):
         return original
-    decisions = _migration_dialog(original, colors, has_legacy)
+    decisions = _migration_dialog(filename, colors, has_legacy)
     if not decisions.get("accepted"):
         raise RuntimeError("cpb comment migration was canceled")
     updated = original

{pydifftools-0.1.37 → pydifftools-0.1.38}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyDiffTools"
-version = "0.1.37"
+version = "0.1.38"
 authors = [{ name = "J M Franck" }]
 description = "Diff tools"
 readme = "README.rst"

{pydifftools-0.1.37 → pydifftools-0.1.38}/tests/test_comment_migration.py

@@ -13,11 +13,14 @@ def test_hue_picker_starts_at_seed_and_fills_largest_hue_gap():
     assert _most_distant_hue(["#ff0000", "#00ff00"]) == pytest.approx(240)
 
 
-def test_migration_dialog_builds_qt_script_and_decodes_result(monkeypatch):
+def test_migration_dialog_builds_qt_script_and_decodes_result(
+    tmp_path, monkeypatch
+):
     captured = {}
 
     def fake_run(command, **_kwargs):
         captured["script"] = command[2]
+        captured["command"] = command
         compile(command[2], "<comment migration dialog>", "exec")
         return type(
             "Completed",
@@ -27,11 +30,17 @@ def test_migration_dialog_builds_qt_script_and_decodes_result(monkeypatch):
 
     monkeypatch.setattr(comment_migration.subprocess, "run", fake_run)
 
-    result = _migration_dialog("<ABcom>note</ABcom>", {}, False)
+    path = tmp_path / "notes.md"
+    path.write_text("<ABcom>note</ABcom>", encoding="utf-8")
+    result = _migration_dialog(str(path), {}, False)
 
     assert result == {"accepted": True}
     assert "QColor.fromHsv" in captured["script"]
     assert "QComboBox" in captured["script"]
+    # the document is passed by filename, since large files exceed the argv
+    # limit
+    assert captured["command"][4] == str(path)
+    assert "<ABcom>" not in captured["command"][3]
 
 
 def test_prepare_migrates_legacy_tags_and_div_classes(tmp_path, monkeypatch):