##// END OF EJS Templates
fallback to pyqt5 if present
Zachary Pincus -
Show More
@@ -19,7 +19,7 b' if QT_API not set:'
19 else: (matplotlib said nothing)
19 else: (matplotlib said nothing)
20 # this is the default path - nobody told us anything
20 # this is the default path - nobody told us anything
21 try in this order:
21 try in this order:
22 PyQt default version, PySide
22 PyQt default version, PySide, PyQt5
23 else:
23 else:
24 use what QT_API says
24 use what QT_API says
25
25
@@ -83,8 +83,7 b' def get_options():'
83 qt_api = os.environ.get('QT_API', None)
83 qt_api = os.environ.get('QT_API', None)
84 if qt_api is None:
84 if qt_api is None:
85 #no ETS variable. Ask mpl, then use default fallback path
85 #no ETS variable. Ask mpl, then use default fallback path
86 # TODO: should Qt5 be on the fallback path if there is no Qt4 API?
86 return matplotlib_options(mpl) or [QT_API_PYQT_DEFAULT, QT_API_PYSIDE, QT_API_PYQT5]
87 return matplotlib_options(mpl) or [QT_API_PYQT_DEFAULT, QT_API_PYSIDE]
88 elif qt_api not in _qt_apis:
87 elif qt_api not in _qt_apis:
89 raise RuntimeError("Invalid Qt API %r, valid values are: %r" %
88 raise RuntimeError("Invalid Qt API %r, valid values are: %r" %
90 (qt_api, ', '.join(_qt_apis)))
89 (qt_api, ', '.join(_qt_apis)))
General Comments 0
You need to be logged in to leave comments. Login now