pyDiffTools 0.1.44__tar.gz → 0.1.46__tar.gz

{pydifftools-0.1.44/pyDiffTools.egg-info → pydifftools-0.1.46}/PKG-INFO

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

{pydifftools-0.1.44 → pydifftools-0.1.46/pyDiffTools.egg-info}/PKG-INFO

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

{pydifftools-0.1.44 → pydifftools-0.1.46}/pydifftools/continuous.py

@@ -149,10 +149,10 @@ def show_markdown_fix_dialog(report):
     if not fixes and not warnings and not layout:
         return
 
+    # a QApplication must exist before any widget is constructed
+    application = QApplication.instance() or QApplication([])
     dialog = QDialog()
-    dialog._pydifftools_application = (
-        QApplication.instance() or QApplication([])
-    )
+    dialog._pydifftools_application = application
     dialog.setWindowTitle("Markdown source fixes")
     fixed_font = QFontDatabase.systemFont(QFontDatabase.SystemFont.FixedFont)
     # {{{ group fixes of one kind onto pages that fill the screen
@@ -372,10 +372,10 @@ def show_markdown_reload_dialog():
         QVBoxLayout,
     )
 
+    # a QApplication must exist before any widget is constructed
+    application = QApplication.instance() or QApplication([])
     dialog = QDialog()
-    dialog._pydifftools_application = (
-        QApplication.instance() or QApplication([])
-    )
+    dialog._pydifftools_application = application
     dialog.setWindowTitle("Reload the Markdown source")
     dialog.resize(440, 150)
     layout = QVBoxLayout(dialog)

{pydifftools-0.1.44 → pydifftools-0.1.46}/pydifftools/wrap_sentences.py

@@ -1207,8 +1207,8 @@ def apply_markdown_issue_fix(content, line_number, message):
             updated,
             before,
             after,
-            "A crossref marker was separated from its equation or figure. "
-            "I joined it back on.",
+            "One or more crossref markers were separated from their "
+            "equation or figure. I joined them back on.",
         )
         # }}}
     old_line = lines[index]
@@ -1239,7 +1239,8 @@ def apply_markdown_issue_fix(content, line_number, message):
             "".join(lines),
             old_line,
             old_line[:-1],
-            "A line ended with a single stray space. I removed it.",
+            "One or more lines ended with a single stray space. I removed "
+            "those spaces.",
         )
     if message.startswith("line too long:"):
         match = re.search(r"after '(.+?)' \(before '(.+?)'\); move", message)
@@ -1263,8 +1264,8 @@ def apply_markdown_issue_fix(content, line_number, message):
         first = old_line[:split_at].rstrip()
         second = old_line[split_at:].lstrip(" \t")
         reason = (
-            "This line was hard to read because it held too many words. "
-            "I moved the next words onto a new line."
+            "One or more lines were run-on lines, longer than the line "
+            "width. I moved the extra words onto new lines."
         )
     elif message.startswith("sentence ends mid-line"):
         boundary = SENTENCE_BOUNDARY.search(old_line)
@@ -1276,8 +1277,11 @@ def apply_markdown_issue_fix(content, line_number, message):
         first = old_line[: boundary.end(1)].rstrip()
         second = old_line[boundary.end(2) :].lstrip(" \t")
         reason = (
-            "A sentence ended, but the next sentence continued on the same "
-            "source line. I started it on a new line."
+            "One or more sentences started in the middle of a source line. "
+            "Since you can line-break the source wherever you want (only "
+            "double breaks give a new paragraph), you should <b>always "
+            "start sentences on new lines</b>. I started each one on a new "
+            "line."
         )
     else:
         raise ValueError(f"No automatic fix is available for {message!r}")
@@ -1614,15 +1618,15 @@ def autofix_markdown_file(
                 reasons = []
                 if result["linted"]:
                     reasons.append(
-                        "This edit made a line too long or ended a sentence "
-                        "mid-line. I broke it where it keeps the most lines "
-                        "unchanged from git HEAD."
+                        "One or more edits made a line too long or ended a "
+                        "sentence mid-line. I broke those lines where they "
+                        "keep the most lines unchanged from git HEAD."
                     )
                 if result["moved"]:
                     reasons.append(
-                        "This edit moved a line break away from where git "
-                        "HEAD has it. I put it back so the unchanged lines "
-                        "stay unchanged."
+                        "One or more edits moved a line break away from "
+                        "where git HEAD has it. I put those breaks back so "
+                        "the unchanged lines stay unchanged."
                     )
                 fixes.append(
                     {

{pydifftools-0.1.44 → pydifftools-0.1.46}/pyproject.toml

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

{pydifftools-0.1.44 → pydifftools-0.1.46}/tests/test_wrap_check.py

@@ -1,5 +1,7 @@
+import os
 import re
 import subprocess
+import sys
 
 import pytest
 
@@ -102,7 +104,7 @@ def test_markdown_autofix_inserts_soft_returns(tmp_path):
     assert markdown_lint_issues_from_text(fixed, wrapnumber=55) == []
     assert "First sentence ends here.\nA second sentence" in fixed
     assert any(
-        "moved the next words" in item["reason"]
+        "moved the extra words" in item["reason"]
         for item in report["fixes"]
     )
 
@@ -118,7 +120,7 @@ def test_one_reported_long_line_is_fixed_at_the_suggested_word():
     assert before in source
     assert "\n" in after
     assert after in fixed
-    assert "hard to read" in reason
+    assert "run-on lines" in reason
 
 
 def test_lint_line_numbers_survive_labeled_display_math():
@@ -744,7 +746,7 @@ def test_stray_line_break_in_an_unchanged_line_is_rejoined(tmp_path):
 
     assert path.read_text() == HEAD_PARAGRAPH
     assert numstat(path) == (0, 0)
-    assert "put it back" in report["fixes"][0]["reason"]
+    assert "put those breaks back" in report["fixes"][0]["reason"]
 
 
 def test_one_moved_line_break_is_moved_back(tmp_path):
@@ -909,3 +911,49 @@ def test_qt_layout_notice_shows_head_now_and_suggested(tmp_path):
     assert head.startswith("git HEAD:")
     assert re.search(r"^ +3 This script determines .* amplitudes$", now, re.M)
     assert re.search(r"^ +4 spectral lines for", suggested, re.M)
+
+
+def test_qt_fix_windows_create_their_own_application():
+    # cpb shows these windows without a QApplication; constructing the
+    # dialog first aborted the whole process
+    pytest.importorskip("PySide6")
+    script = (
+        "from PySide6.QtWidgets import QDialog\n"
+        "QDialog.exec = lambda self: 0\n"
+        "from pydifftools.continuous import (\n"
+        "    show_markdown_fix_dialog, show_markdown_reload_dialog)\n"
+        "show_markdown_fix_dialog({'fixes': [{'line': 1, 'reason': 'r',\n"
+        "    'before': 'a ', 'after': 'a'}], 'warnings': []})\n"
+        "show_markdown_reload_dialog()\n"
+        "print('shown')\n"
+    )
+
+    completed = subprocess.run(
+        [sys.executable, "-c", script],
+        capture_output=True,
+        text=True,
+        env={**os.environ, "QT_QPA_PLATFORM": "offscreen"},
+    )
+
+    assert completed.returncode == 0, completed.stderr
+    assert completed.stdout.strip() == "shown"
+
+
+def test_fix_reasons_cover_one_or_more_lines(tmp_path):
+    # one reason heads a whole page of fixes, so it never says "a line"
+    path = tmp_path / "source.md"
+    path.write_text(
+        "First sentence ends here. A second sentence begins.\n"
+        "This line is a run-on line that goes on well past the width.\n"
+        "It ends with a stray space. \n"
+    )
+
+    report = autofix_markdown_file(path, wrapnumber=55)
+
+    reasons = {fix["reason"] for fix in report["fixes"]}
+    assert len(reasons) == 3
+    assert all(reason.startswith("One or more ") for reason in reasons)
+    assert any(
+        "<b>always start sentences on new lines</b>" in reason
+        for reason in reasons
+    )