From 0ef3938893bfc868ad00ef7d51e1dbf08dd11e0a Mon Sep 17 00:00:00 2001 From: deeplow Date: Fri, 23 Dec 2022 14:13:39 +0000 Subject: [PATCH] Import Pyside6, fallback to Pyside2 when unavailable Fixes #177 --- dangerzone/gui/__init__.py | 6 +++++- dangerzone/gui/logic.py | 6 +++++- dangerzone/gui/main_window.py | 10 +++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dangerzone/gui/__init__.py b/dangerzone/gui/__init__.py index 4587839f2..3c87239b4 100644 --- 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 index b6b7c73fe..b50afc165 100644 --- 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 index ef33a0bfc..9e8e8c9ac 100644 --- 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