##// END OF EJS Templates
Revert "add shim for external/qt_for_kernel.py"...
Zachary Pincus -
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 Qt has been imported anywhere else:
7 if Qt4 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 QT_API env variable
13 Next, ask ETS' QT_API env variable
14 14
15 15 if QT_API not set:
16 16 ask matplotlib via rcParams['backend.qt4']
@@ -26,7 +26,8 b' if QT_API not set:'
26 26 except:
27 27 fallback on PySide
28 28 else:
29 use what QT_API says
29 use PyQt @v2 or PySide, depending on QT_API
30 because ETS doesn't work with PyQt @v1.
30 31
31 32 """
32 33
@@ -41,9 +42,7 b' from IPython.external.qt_loaders import (load_qt, loaded_api, QT_API_PYSIDE,'
41 42 _qt_apis = (QT_API_PYSIDE, QT_API_PYQT, QT_API_PYQT5, QT_API_PYQTv1,
42 43 QT_API_PYQT_DEFAULT)
43 44
44 # Constraints placed on an imported matplotlib
45 # TODO: check that this is still consistent with what matplotlib supports,
46 # in particular with regard to qt5.
45 #Constraints placed on an imported matplotlib
47 46 def matplotlib_options(mpl):
48 47 if mpl is None:
49 48 return
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now