##// END OF EJS Templates
Backport PR #8829: Qt5 fix...
Min RK -
Show More
@@ -4,13 +4,13 b' This is the import used for the `gui=qt` or `matplotlib=qt` initialization.'
4 4
5 5 Import Priority:
6 6
7 if Qt4 has been imported anywhere else:
7 if Qt has been imported anywhere else:
8 8 use that
9 9
10 10 if matplotlib has been imported and doesn't support v2 (<= 1.0.1):
11 11 use PyQt4 @v1
12 12
13 Next, ask ETS' QT_API env variable
13 Next, ask QT_API env variable
14 14
15 15 if QT_API not set:
16 16 ask matplotlib via rcParams['backend.qt4']
@@ -26,20 +26,29 b' if QT_API not set:'
26 26 except:
27 27 fallback on PySide
28 28 else:
29 use PyQt @v2 or PySide, depending on QT_API
30 because ETS doesn't work with PyQt @v1.
29 use what QT_API says
31 30
32 31 """
32 # NOTE: This is no longer an external, third-party module, and should be
33 # considered part of IPython. For compatibility however, it is being kept in
34 # IPython/external.
33 35
34 36 import os
35 37 import sys
36 38
37 39 from IPython.utils.version import check_version
38 from IPython.external.qt_loaders import (load_qt, QT_API_PYSIDE,
39 QT_API_PYQT, QT_API_PYQT_DEFAULT,
40 loaded_api)
40 from IPython.external.qt_loaders import (load_qt, loaded_api, QT_API_PYSIDE,
41 QT_API_PYQT, QT_API_PYQT5,
42 QT_API_PYQTv1, QT_API_PYQT_DEFAULT)
43
44 _qt_apis = (QT_API_PYSIDE, QT_API_PYQT, QT_API_PYQT5, QT_API_PYQTv1,
45 QT_API_PYQT_DEFAULT)
41 46
42 47 #Constraints placed on an imported matplotlib
48 # TODO: Make sure this logic is still in sync with matplotlib's requirements.
49 # In particular, matplotlib can also now support a qt5 backend, and so this will
50 # break if matplotlib is imported and running happily with qt5, because
51 # it only queries for the preferred qt4 option.
43 52 def matplotlib_options(mpl):
44 53 if mpl is None:
45 54 return
@@ -68,16 +77,15 b' def get_options():'
68 77 #1.0.1 only supports PyQt4 v1
69 78 return [QT_API_PYQT_DEFAULT]
70 79
71 if os.environ.get('QT_API', None) is None:
80 qt_api = os.environ.get('QT_API', None)
81 if qt_api is None:
72 82 #no ETS variable. Ask mpl, then use either
73 83 return matplotlib_options(mpl) or [QT_API_PYQT_DEFAULT, QT_API_PYSIDE]
74
75 #ETS variable present. Will fallback to external.qt
76 return None
84 elif qt_api not in _qt_apis:
85 raise RuntimeError("Invalid Qt API %r, valid values are: %r" %
86 (qt_api, ', '.join(_qt_apis)))
87 else:
88 return [qt_api]
77 89
78 90 api_opts = get_options()
79 if api_opts is not None:
80 QtCore, QtGui, QtSvg, QT_API = load_qt(api_opts)
81
82 else: # use ETS variable
83 from IPython.external.qt import QtCore, QtGui, QtSvg, QT_API
91 QtCore, QtGui, QtSvg, QT_API = load_qt(api_opts)
General Comments 0
You need to be logged in to leave comments. Login now