Import Pyside6, fallback to Pyside2 when unavailable

Fixes #177
freedomofpress · Dec 23, 2022 · 0ef3938 · 0ef3938
1 parent fbb4b18
commit 0ef3938
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/dangerzone/gui/__init__.py b/dangerzone/gui/__init__.py
@@ -9,7 +9,11 @@
 
 import click
 import colorama
-from PySide2 import QtCore, QtGui, QtWidgets
+
+try:
+    from PySide6 import QtCore, QtGui, QtWidgets
+except ImportError:
+    from PySide2 import QtCore, QtGui, QtWidgets
 
 from .. import args, errors
 from ..document import Document

diff --git a/dangerzone/gui/logic.py b/dangerzone/gui/logic.py
@@ -8,7 +8,11 @@
 from typing import Dict
 
 from colorama import Fore
-from PySide2 import QtCore, QtGui, QtWidgets
+
+try:
+    from PySide6 import QtCore, QtGui, QtWidgets
+except ImportError:
+    from PySide2 import QtCore, QtGui, QtWidgets
 
 if platform.system() == "Linux":
     from xdg.DesktopEntry import DesktopEntry

diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py
@@ -9,7 +9,15 @@
 from typing import List, Optional
 
 from colorama import Fore, Style
-from PySide2 import QtCore, QtGui, QtWidgets
+
+try:
+    from PySide6 import QtCore, QtGui, QtWidgets
+
+    # Alias renamed Qt6 methods for backwards compatibility
+    QtCore.QRegExp = QtCore.QRegularExpression
+    QtGui.QRegExpValidator = QtGui.QRegularExpressionValidator
+except ImportError:
+    from PySide2 import QtCore, QtGui, QtWidgets
 
 from .. import container, errors
 from ..container import convert