[silx] 03/04: prefer pyqt5 over pyside

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch patch-queue/master
in repository silx.

commit 0b5c957ca760440c3f4160c7e192dc2ed338d0f4
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Aug 14 14:58:02 2017 +0200

    prefer pyqt5 over pyside
    
    
    Gbp-Pq: Name 0006-prefer-pyqt5-over-pyside.patch
---
 silx/gui/qt/_qt.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/silx/gui/qt/_qt.py b/silx/gui/qt/_qt.py
index 0962c21..67f3e46 100644
--- a/silx/gui/qt/_qt.py
+++ b/silx/gui/qt/_qt.py
@@ -64,12 +64,12 @@ HAS_OPENGL = False
 """True if Qt provides support for OpenGL (QtOpenGL)."""
 
 # First check for an already loaded wrapper
-if 'PySide.QtCore' in sys.modules:
-    BINDING = 'PySide'
-
-elif 'PyQt5.QtCore' in sys.modules:
+if 'PyQt5.QtCore' in sys.modules:
     BINDING = 'PyQt5'
 
+elif 'PySide.QtCore' in sys.modules:
+    BINDING = 'PySide'
+
 elif 'PyQt4.QtCore' in sys.modules:
     BINDING = 'PyQt4'
 
@@ -78,17 +78,17 @@ else:  # Then try Qt bindings
         import PyQt4  # noqa
     except ImportError:
         try:
-            import PySide  # noqa
+            import PyQt5  # noqa
         except ImportError:
             try:
-                import PyQt5  # noqa
+                import PySide  # noqa
             except ImportError:
                 raise ImportError(
                     'No Qt wrapper found. Install PyQt4, PyQt5 or PySide.')
             else:
-                BINDING = 'PyQt5'
+                BINDING = 'PySide'
         else:
-            BINDING = 'PySide'
+            BINDING = 'PyQt5'
     else:
         BINDING = 'PyQt4'
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silx.git