Skip to content

Commit 13a5d5b

Browse files
author
neok-m4700
committed
support for pyside2 with qtpy
1 parent 5efa5c3 commit 13a5d5b

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

‎lib/matplotlib/backends/backend_qt5.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,16 @@ def __init__(self, figure):
238238
print('FigureCanvasQt qt5: ', figure)
239239
_create_qApp()
240240

241-
# NB: Using super for this call to avoid a TypeError:
242-
# __init__() takes exactly 2 arguments (1 given) on QWidget
243-
# PyQt5
244-
# The need for this change is documented here
245-
# http://pyqt.sourceforge.net/Docs/PyQt5/pyqt4_differences.html#cooperative-multi-inheritance
246-
super(FigureCanvasQT, self).__init__(figure=figure)
241+
if is_pyqt5():
242+
# NB: Using super for this call to avoid a TypeError:
243+
# __init__() takes exactly 2 arguments (1 given) on QWidget
244+
# PyQt5
245+
# The need for this change is documented here
246+
# http://pyqt.sourceforge.net/Docs/PyQt5/pyqt4_differences.html#cooperative-multi-inheritance
247+
super(FigureCanvasQT, self).__init__(figure=figure)
248+
else:
249+
QtWidgets.QWidget.__init__(self)
250+
FigureCanvasBase.__init__(self, figure)
247251
self.figure = figure
248252
self.setMouseTracking(True)
249253
w, h = self.get_width_height()

‎lib/matplotlib/backends/qt_compat.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,3 +223,12 @@ def _getSaveFileName(*args, **kwargs):
223223

224224
def is_pyqt5():
225225
return QT_API == QT_API_PYQT5
226+
227+
228+
try:
229+
from qtpy import QtCore, QtGui, QtWidgets, QT_VERSION
230+
QFileDialog = QtGui.QFileDialog if hasattr(QtGui, 'QFileDialog') else QtWidgets.QFileDialog
231+
_getSaveFileName = QFileDialog.getSaveFileName
232+
__version__ = QT_VERSION
233+
except ImportError:
234+
pass

‎lib/matplotlib/tests/test_backend_qt4.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
from matplotlib.backends.backend_qt4 import (MODIFIER_KEYS,
1919
SUPER, ALT, CTRL, SHIFT) # noqa
2020

21+
2122
QtCore = qt_compat.QtCore
2223
_, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
2324
_, AltModifier, AltKey = MODIFIER_KEYS[ALT]
2425
_, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
2526
_, ShiftModifier, ShiftKey = MODIFIER_KEYS[SHIFT]
2627

2728
try:
28-
py_qt_ver = int(QtCore.PYQT_VERSION_STR.split('.')[0])
29+
py_qt_ver = int(qt_compat.__version__.split('.')[0])
2930
except AttributeError:
3031
py_qt_ver = QtCore.__version_info__[0]
3132

0 commit comments

Comments
 (0)