summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2023-06-12 21:33:58 +0200
committerFlorian Bruhin <me@the-compiler.org>2023-06-12 21:42:16 +0200
commit9aaf08e3291a3da96e54e24f4f82b7e8f02092b9 (patch)
tree21985aa021ee04800c22ce8ff6e14efe3413f72a
parent1bd60385ebd3cbd410fad465ec325b386233211d (diff)
downloadqutebrowser-9aaf08e3291a3da96e54e24f4f82b7e8f02092b9.tar.gz
qutebrowser-9aaf08e3291a3da96e54e24f4f82b7e8f02092b9.zip
qt: Simplify qt.sip
-rw-r--r--qutebrowser/qt/sip.py16
1 files changed, 5 insertions, 11 deletions
diff --git a/qutebrowser/qt/sip.py b/qutebrowser/qt/sip.py
index 7be3b061c..3d2c51c39 100644
--- a/qutebrowser/qt/sip.py
+++ b/qutebrowser/qt/sip.py
@@ -18,26 +18,20 @@ from qutebrowser.qt import machinery
machinery.init()
-# While upstream recommends using PyQt6.sip ever since PyQt6 5.11, some distributions
-# still package later versions of PyQt6 with a top-level "sip" rather than "PyQt6.sip".
-_VENDORED_SIP = False
-
if machinery.USE_PYSIDE6: # pylint: disable=no-else-raise
raise machinery.Unavailable()
elif machinery.USE_PYQT5:
try:
from PyQt5.sip import *
- _VENDORED_SIP = True
except ImportError:
- pass
+ from sip import * # type: ignore[import]
elif machinery.USE_PYQT6:
try:
from PyQt6.sip import *
- _VENDORED_SIP = True
except ImportError:
- pass
+ # While upstream recommends using PyQt5.sip ever since PyQt5 5.11, some
+ # distributions still package later versions of PyQt5 with a top-level
+ # "sip" rather than "PyQt5.sip".
+ from sip import * # type: ignore[import]
else:
raise machinery.UnknownWrapper()
-
-if not _VENDORED_SIP:
- from sip import * # type: ignore[import]