Merge from 2.3: Fallback to PySide was not working (PR #2650)

spyder-ide · Aug 30, 2015 · 68da923 · 68da923
2 parents d6f08e2 + d3801ce
commit 68da923
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/spyderlib/qt/__init__.py b/spyderlib/qt/__init__.py
@@ -29,21 +29,21 @@
     # Spyder 2.3 is compatible with both #1 and #2 PyQt API,
     # but to avoid issues with IPython and other Qt plugins
     # we choose to support only API #2 for 2.4+
-    import sip
     try:
-        sip.setapi('QString', 2)
-        sip.setapi('QVariant', 2)
-        sip.setapi('QDate', 2)
-        sip.setapi('QDateTime', 2)
-        sip.setapi('QTextStream', 2)
-        sip.setapi('QTime', 2)
-        sip.setapi('QUrl', 2)
-    except AttributeError:
-        # PyQt < v4.6. The actual check is done by requirements.check_qt()
-        # call from spyder.py
-        pass
+        import sip
+        try:
+            sip.setapi('QString', 2)
+            sip.setapi('QVariant', 2)
+            sip.setapi('QDate', 2)
+            sip.setapi('QDateTime', 2)
+            sip.setapi('QTextStream', 2)
+            sip.setapi('QTime', 2)
+            sip.setapi('QUrl', 2)
+        except AttributeError:
+            # PyQt < v4.6. The actual check is done by requirements.check_qt()
+            # call from spyder.py
+            pass
 
-    try:
         from PyQt4.QtCore import PYQT_VERSION_STR as __version__ # analysis:ignore
     except ImportError:
         # Switching to PySide