Merge pull request #8315 from tacaswell/fix_qt_fallback

efiring · web-flow · commit 4308d39500f0 · 2017-05-08T09:09:49.000-10:00
[MRG+1] FIX: if explicitly asked for Qt5 backend, do not fallback to qt4
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -70,6 +70,7 @@
         # compatible use the env variable.
         QT_API = ETS[QT_API_ENV][0]
 
+_fallback_to_qt4 = False
 if QT_API is None:
     # No ETS environment or incompatible so use rcParams.
     if rcParams['backend'] == 'Qt5Agg':
@@ -81,7 +82,7 @@
         # bindings is imported, but we still got here because a Qt
         # related file was imported. This is allowed, fall back to Qt5
         # using which ever binding the rparams ask for.
-
+        _fallback_to_qt4 = True
         QT_API = rcParams['backend.qt5']
 
 # We will define an appropriate wrapper for the differing versions
@@ -127,9 +128,12 @@
             from PyQt5 import QtCore, QtGui, QtWidgets
             _getSaveFileName = QtWidgets.QFileDialog.getSaveFileName
         except ImportError:
-            # fell through, tried PyQt5, failed fall back to PyQt4
-            QT_API = rcParams['backend.qt4']
-            QT_RC_MAJOR_VERSION = 4
+            if _fallback_to_qt4:
+                # fell through, tried PyQt5, failed fall back to PyQt4
+                QT_API = rcParams['backend.qt4']
+                QT_RC_MAJOR_VERSION = 4
+            else:
+                raise
 
     # needs to be if so we can re-test the value of QT_API which may
     # have been changed in the above if block
