MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] Add PySide6 support

Browse Source 
- Extend inputhookqt6 to support both PyQt6 and PySide6
- Add PySide support to inputhooks
- Switch to PySide6 in qt_loaders



GitOrigin-RevId: 7391fcb053cdb7bd4e8c610f4ffbb02dc40acaa3
This commit is contained in:
jmakovicka
2025-06-24 16:36:11 +00:00
committed by intellij-monorepo-bot
parent d1c4cfd660
commit 15ebae79fa
3 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/pydev/pydev_ipython/inputhook.py
+15 -2
View File
@@ -27,6 +27,7 @@ GUI_QT = 'qt'
GUI_QT4 = 'qt4'
GUI_QT5 = 'qt5'
GUI_QT6 = 'qt6'
GUI_PYSIDE = 'pyside'
GUI_GTK = 'gtk'
GUI_TK = 'tk'
GUI_OSX = 'osx'
@@ -180,9 +181,11 @@ class InputHookManager(object):
self.clear_inputhook()
def enable_qt(self, app=None):
from pydev_ipython.qt_for_kernel import QT_API, QT_API_PYQT5, QT_API_PYQT6
from pydev_ipython.qt_for_kernel import QT_API, QT_API_PYQT5, QT_API_PYQT6, QT_API_PYSIDE
if QT_API == QT_API_PYQT6:
self.enable_qt6(app)
elif QT_API == QT_API_PYSIDE:
self.enable_pyside(app)
elif QT_API == QT_API_PYQT5:
self.enable_qt5(app)
else:
@@ -245,7 +248,7 @@ class InputHookManager(object):
def enable_qt6(self, app=None):
from pydev_ipython.inputhookqt6 import create_inputhook_qt6
app, inputhook_qt6 = create_inputhook_qt6(self, app)
app, inputhook_qt6 = create_inputhook_qt6(self, app, GUI_QT6)
self.set_inputhook(inputhook_qt6)
self._current_gui = GUI_QT6
@@ -253,6 +256,16 @@ class InputHookManager(object):
self._apps[GUI_QT6] = app
return app
def enable_pyside(self, app=None):
from pydev_ipython.inputhookqt6 import create_inputhook_qt6
app, inputhook_pyside = create_inputhook_qt6(self, app, GUI_PYSIDE)
self.set_inputhook(inputhook_pyside)
self._current_gui = GUI_PYSIDE
app._in_event_loop = True
self._apps[GUI_PYSIDE] = app
return app
def disable_qt6(self):
if GUI_QT6 in self._apps:
self._apps[GUI_QT6]._in_event_loop = False
python/helpers/pydev/pydev_ipython/inputhookqt6.py
+14 -7
View File
@@ -22,8 +22,7 @@ import signal
import threading
from PyQt6 import QtCore, QtGui
from pydev_ipython.inputhook import allow_CTRL_C, ignore_CTRL_C, stdin_ready
from pydev_ipython.inputhook import allow_CTRL_C, ignore_CTRL_C, stdin_ready, GUI_QT6, GUI_PYSIDE
# To minimise future merging complexity, rather than edit the entire code base below
# we fake InteractiveShell here
@@ -51,7 +50,7 @@ sigint_timer = None
# Code
#-----------------------------------------------------------------------------
def create_inputhook_qt6(mgr, app=None):
def create_inputhook_qt6(mgr, app=None, gui=GUI_QT6):
"""Create an input hook for running the Qt6 application event loop.
Parameters
@@ -79,10 +78,18 @@ def create_inputhook_qt6(mgr, app=None):
"""
if app is None:
app = QtCore.QCoreApplication.instance()
if app is None:
from PyQt6 import QtWidgets
app = QtWidgets.QApplication([" "])
if gui == GUI_QT6:
from PyQt6 import QtCore
app = QtCore.QCoreApplication.instance()
if app is None:
from PyQt6 import QtWidgets
app = QtWidgets.QApplication([" "])
elif gui == GUI_PYSIDE:
from PySide6 import QtCore
app = QtCore.QCoreApplication.instance()
if app is None:
from PySide6 import QtWidgets
app = QtWidgets.QApplication([" "])
# Re-use previously created inputhook if any
ip = InteractiveShell.instance()
python/helpers/pydev/pydev_ipython/qt_loaders.py
+22 -19
View File
@@ -23,10 +23,13 @@ QT_API_PYQT5 = 'pyqt5'
QT_API_PYQT6 = 'pyqt6'
def find_module(module_name, path=None):
def find_module(module_name, path=None, parent_name=None):
spec = importlib.util.find_spec(module_name, path)
if spec is None:
raise ImportError
if parent_name is not None:
spec = importlib.util.find_spec(parent_name + '.' + module_name, path)
if spec is None:
raise ImportError
class ImportDenier(object):
@@ -66,7 +69,7 @@ def commit_api(api):
ID.forbid('PyQt5')
ID.forbid('PyQt6')
else:
ID.forbid('PySide')
ID.forbid('PySide6')
def loaded_api():
@@ -84,7 +87,7 @@ def loaded_api():
return QT_API_PYQT
else:
return QT_API_PYQTv1
elif 'PySide.QtCore' in sys.modules:
elif 'PySide6.QtCore' in sys.modules:
return QT_API_PYSIDE
elif 'PyQt5.QtCore' in sys.modules:
return QT_API_PYQT5
@@ -94,7 +97,7 @@ def loaded_api():
def has_binding(api):
"""Safely check for PyQt4 or PySide, without importing
"""Safely check for PyQt4 or PySide6, without importing
submodules
Parameters
@@ -109,7 +112,7 @@ def has_binding(api):
# we can't import an incomplete pyside and pyqt4
# this will cause a crash in sip (#1431)
# check for complete presence before importing
module_name = {QT_API_PYSIDE: 'PySide',
module_name = {QT_API_PYSIDE: 'PySide6',
QT_API_PYQT: 'PyQt4',
QT_API_PYQTv1: 'PyQt4',
QT_API_PYQT_DEFAULT: 'PyQt4',
@@ -119,16 +122,16 @@ def has_binding(api):
module_name = module_name[api]
try:
#importing top level PyQt4/PySide module is ok...
#importing top level PyQt4/PySide6 module is ok...
mod = __import__(module_name)
#...importing submodules is not
find_module('QtCore', mod.__path__)
find_module('QtGui', mod.__path__)
find_module('QtSvg', mod.__path__)
find_module('QtCore', mod.__path__, mod.__name__)
find_module('QtGui', mod.__path__, mod.__name__)
find_module('QtSvg', mod.__path__, mod.__name__)
#we can also safely check PySide version
#we can also safely check PySide6 version
if api == QT_API_PYSIDE:
return check_version(mod.__version__, '1.0.3')
return check_version(mod.__version__, '6.0.0')
else:
return True
except ImportError:
@@ -191,7 +194,7 @@ def import_pyqt4(version=2):
raise ImportError("IPython requires PyQt4 >= 4.7, found %s" %
QtCore.PYQT_VERSION_STR)
# Alias PyQt-specific functions for PySide compatibility.
# Alias PyQt-specific functions for PySide6 compatibility.
QtCore.Signal = QtCore.pyqtSignal
QtCore.Slot = QtCore.pyqtSlot
@@ -208,7 +211,7 @@ def import_pyqt5():
"""
from PyQt5 import QtGui, QtCore, QtSvg
# Alias PyQt-specific functions for PySide compatibility.
# Alias PyQt-specific functions for PySide6 compatibility.
QtCore.Signal = QtCore.pyqtSignal
QtCore.Slot = QtCore.pyqtSlot
@@ -217,7 +220,7 @@ def import_pyqt5():
def import_pyqt6():
from PyQt6 import QtGui, QtCore, QtSvg
# Alias PyQt-specific functions for PySide compatibility.
# Alias PyQt-specific functions for PySide6 compatibility.
QtCore.Signal = QtCore.pyqtSignal
QtCore.Slot = QtCore.pyqtSlot
@@ -226,11 +229,11 @@ def import_pyqt6():
def import_pyside():
"""
Import PySide
Import PySide6
ImportErrors raised within this function are non-recoverable
"""
from PySide import QtGui, QtCore, QtSvg # @UnresolvedImport
from PySide6 import QtGui, QtCore, QtSvg # @UnresolvedImport
return QtCore, QtGui, QtSvg, QT_API_PYSIDE
@@ -287,14 +290,14 @@ def load_qt(api_options):
else:
raise ImportError("""
Could not load requested Qt binding. Please ensure that
PyQt4 >= 4.7 or PySide >= 1.0.3 is available,
PyQt4 >= 4.7 or PySide6 >= 6.0.0 is available,
and only one is imported per session.
Currently-imported Qt library: %r
PyQt4 installed: %s
PyQt5 installed: %s
PyQt6 installed: %s
PySide >= 1.0.3 installed: %s
PySide6 >= 6.0.0 installed: %s
Tried to load: %r
""" % (loaded_api(),
has_binding(QT_API_PYQT),