pyDiffTools 0.1.44__tar.gz → 0.1.45__tar.gz

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

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

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

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

{pydifftools-0.1.44 → pydifftools-0.1.45}/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.45}/pyproject.toml

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

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

@@ -1,5 +1,7 @@
+import os
 import re
 import subprocess
+import sys
 
 import pytest
 
@@ -909,3 +911,29 @@ 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"