Merge pull request #1024 from stefanv/bugs/qt_pyside_matplotlib_compat

Use same import order as matplotlib for PySide/PyQT
This commit is contained in:
Johannes Schönberger
2014-06-15 22:20:56 -04:00
+4 -4
View File
@@ -5,12 +5,12 @@ qt_api = os.environ.get('QT_API')
if qt_api is None:
try:
import PySide
qt_api = 'pyside'
import PyQt4
qt_api = 'pyqt'
except ImportError:
try:
import PyQt4
qt_api = 'pyqt'
import PySide
qt_api = 'pyside'
except ImportError:
qt_api = None
# Note that we don't want to raise an error because that would