PyQt5 Compatibility: Use "pyqt5" QT_API value to decide when to run under this toolkit

- This is the same behavior adopted by IPython

Author: ccordoba12

bootstrap.py

@@ -32,7 +32,8 @@
 Type `python bootstrap.py -- --help` to read about Spyder
 options.""")
 parser.add_option('--gui', default=None,
-                  help="GUI toolkit: pyqt (for PyQt4/PyQt5) or pyside (for PySide)")
+                  help="GUI toolkit: pyqt5 (for PyQt5), pyqt (for PyQt4) or "
+                       "pyside (for PySide)")
 parser.add_option('--hide-console', action='store_true',
                   default=False, help="Hide parent console window (Windows only)")
 parser.add_option('--test', dest="test", action='store_true', default=False,
@@ -43,7 +44,7 @@
                   default=False, help="Run Spyder in debug mode")
 options, args = parser.parse_args()
 
-assert options.gui in (None, 'pyqt', 'pyside'), \
+assert options.gui in (None, 'pyqt5', 'pyqt', 'pyside'), \
        "Invalid GUI toolkit option '%s'" % options.gui
 
 # For testing purposes
@@ -108,11 +109,16 @@
 # (Note: PyQt4 is still the officially supported GUI toolkit for Spyder)
 if options.gui is None:
     try:
-        import PySide  # analysis:ignore
-        print("02. PySide is detected, selecting (experimental)")
-        os.environ['QT_API'] = 'pyside'
-    except:
-        print("02. No PySide detected, using PyQt4 or PyQt5 if available")
+        import PyQt5  # analysis:ignore
+        print("02. PyQt5 is detected, selecting (experimental)")
+        os.environ['QT_API'] = 'pyqt5'
+    except ImportError:
+        try:
+            import PySide  # analysis:ignore
+            print("02. PySide is detected, selecting")
+            os.environ['QT_API'] = 'pyside'
+        except ImportError:
+            print("02. No PyQt5 or PySide detected, using PyQt4 if available")
 else:
     print ("02. Skipping GUI toolkit detection")
     os.environ['QT_API'] = options.gui

spyderlib/qt/QtCore.py

@@ -5,49 +5,23 @@
 # (see spyderlib/__init__.py for details)
 
 import os
-import sys
-
-
-if os.environ['QT_API'] == 'pyqt':
-    if "PyQt4" in sys.modules:
-        from PyQt4.Qt import QSize, QByteArray, QUrl, QThread
-        from PyQt4.Qt import QAbstractTableModel, QModelIndex
-        from PyQt4.Qt import QObject, Qt, QLocale, QTranslator
-        from PyQt4.Qt import QProcess, QTimer, QTextCodec
-        from PyQt4.Qt import QEventLoop, QEvent, QPoint, QRect
-        from PyQt4.Qt import QRegExp, QFileInfo, QMimeData, QDir
-        from PyQt4.Qt import QMutexLocker, QMutex, QCoreApplication, QDateTime
-        from PyQt4.Qt import QBasicTimer
-        from PyQt4.QtCore import QLibraryInfo
-        from PyQt4.QtCore import pyqtSignal as Signal  
-        from PyQt4.QtCore import pyqtSlot as Slot  
-        from PyQt4.QtCore import pyqtProperty as Property  
-        from PyQt4.QtCore import QT_VERSION_STR as __version__
-        from PyQt4.QtCore import QProcessEnvironment
-        try:
-            # PyQt <v4.6 (API #1)
-            from PyQt4.Qt import QString
-        except ImportError:
-            # PyQt >=v4.6
-            QString = None  
-    elif "PyQt5" in sys.modules:
-        from PyQt5.QtCore import QSize, QByteArray, QUrl, QThread
-        from PyQt5.QtCore import QAbstractTableModel, QModelIndex
-        from PyQt5.QtCore import QObject, Qt, QLocale, QTranslator
-        from PyQt5.QtCore import QProcess, QTimer, QTextCodec
-        from PyQt5.QtCore import QEventLoop, QEvent, QPoint, QRect
-        from PyQt5.QtCore import QRegExp, QFileInfo, QMimeData, QDir
-        from PyQt5.QtCore import QMutexLocker, QMutex, QCoreApplication, QDateTime
-        from PyQt5.QtCore import QBasicTimer, QLibraryInfo
-        from PyQt5.QtCore import pyqtSignal as Signal
-        from PyQt5.QtCore import pyqtSlot as Slot
-        from PyQt5.QtCore import pyqtProperty as Property
-        from PyQt5.QtCore import QT_VERSION_STR as __version__
-        from PyQt5.QtCore import QProcessEnvironment
-
-
 
+if os.environ['QT_API'] == 'pyqt5':
+    from PyQt5.QtCore import *                                # analysis:ignore
+    from PyQt5.QtCore import QCoreApplication
+    from PyQt5.QtCore import pyqtSignal as Signal
+    from PyQt5.QtCore import pyqtSlot as Slot
+    from PyQt5.QtCore import pyqtProperty as Property
+    from PyQt5.QtCore import QT_VERSION_STR as __version__
+elif os.environ['QT_API'] == 'pyqt':
+    from PyQt4.QtCore import *                                # analysis:ignore
+    from PyQt4.Qt import QCoreApplication                     # analysis:ignore
+    from PyQt4.Qt import Qt                                   # analysis:ignore
+    from PyQt4.QtCore import pyqtSignal as Signal             # analysis:ignore
+    from PyQt4.QtCore import pyqtSlot as Slot                 # analysis:ignore
+    from PyQt4.QtCore import pyqtProperty as Property         # analysis:ignore
+    from PyQt4.QtCore import QT_VERSION_STR as __version__    # analysis:ignore
 else:
     import PySide.QtCore
-    __version__ = PySide.QtCore.__version__  
-    from PySide.QtCore import *  
+    __version__ = PySide.QtCore.__version__                   # analysis:ignore
+    from PySide.QtCore import *                               # analysis:ignore

spyderlib/qt/QtGui.py

@@ -5,77 +5,16 @@
 # (see spyderlib/__init__.py for details)
 
 import os
-import sys
-
-if os.environ['QT_API'] == 'pyqt':
-    if "PyQt4" in sys.modules:
-        from PyQt4.QtGui import QApplication, QMainWindow, QWidget, QLabel
-        from PyQt4.QtGui import QDockWidget, QShortcut, QCursor, QDialog, QListWidget
-        from PyQt4.QtGui import QListWidgetItem, QVBoxLayout, QStackedWidget, QListView
-        from PyQt4.QtGui import QHBoxLayout, QDialogButtonBox, QCheckBox, QMessageBox
-        from PyQt4.QtGui import QLabel, QLineEdit, QSpinBox, QPushButton
-        from PyQt4.QtGui import QFontComboBox, QGroupBox, QComboBox, QColor, QGridLayout
-        from PyQt4.QtGui import QTabWidget, QRadioButton, QButtonGroup, QSplitter
-        from PyQt4.QtGui import QStyleFactory, QScrollArea, QAction, QPrinter
-        from PyQt4.QtGui import QPrintDialog, QToolBar, QActionGroup
-        from PyQt4.QtGui import QInputDialog, QMenu, QAbstractPrintDialog, QKeySequence
-        from PyQt4.QtGui import QPrintPreviewDialog, QFontDialog, QSizePolicy, QToolButton
-        from PyQt4.QtGui import QFormLayout, QStackedWidget, QFrame, QItemDelegate
-        from PyQt4.QtGui import QTableView, QStackedWidget, QDesktopServices, QStyle
-        from PyQt4.QtGui import QIcon, QKeyEvent, QPixmap, QFont
-        from PyQt4.QtGui import QCursor, QTextCursor, QTextEdit, QTextCharFormat
-        from PyQt4.QtGui import QToolTip, QPlainTextEdit, QPalette, QTextOption
-        from PyQt4.QtGui import QMouseEvent, QTextFormat, QClipboard, QPainter
-        from PyQt4.QtGui import QBrush, QTextDocument, QTextBlockUserData, QIntValidator
-        from PyQt4.QtGui import QSyntaxHighlighter, QDoubleValidator, QAbstractItemDelegate, QProgressBar
-        from PyQt4.QtGui import QColorDialog, QCompleter, QDateEdit, QDateTimeEdit
-        from PyQt4.QtGui import QTreeWidgetItem, QFileSystemModel, QDrag, QSortFilterProxyModel
-        from PyQt4.QtGui import QSpacerItem, QFileIconProvider, QHeaderView, QAbstractItemView
-        from PyQt4.QtGui import QTabBar, QFontDatabase, QSplashScreen
-        from PyQt4.QtGui import QFileDialog, QTreeWidget, QTreeView
-        from PyQt4.QtGui import QStylePainter, QStyleOptionFrame,QPaintEvent
-    elif "PyQt5" in sys.modules:
-        from PyQt5.QtGui import QCursor
-        from PyQt5.QtGui import QColor
-        from PyQt5.QtGui import QKeySequence
-        from PyQt5.QtGui import QDesktopServices
-        from PyQt5.QtGui import QIcon, QKeyEvent, QPixmap, QFont
-        from PyQt5.QtGui import QCursor, QTextCursor
-        from PyQt5.QtGui import QTextCharFormat
-        from PyQt5.QtGui import QPalette, QTextOption
-        from PyQt5.QtGui import QMouseEvent, QTextFormat, QClipboard, QPainter
-        from PyQt5.QtGui import QBrush, QTextDocument, QTextBlockUserData, QIntValidator
-        from PyQt5.QtGui import QSyntaxHighlighter, QDoubleValidator
-        from PyQt5.QtGui import QDrag 
-        from PyQt5.QtGui import QFontDatabase, QPaintEvent
-        from PyQt5.QtWidgets import QApplication, QMainWindow, QWidget, QLabel
-        from PyQt5.QtWidgets import QDockWidget, QShortcut
-        from PyQt5.QtWidgets import QDialog, QListWidget
-        from PyQt5.QtWidgets import QListWidgetItem, QVBoxLayout, QStackedWidget, QListView
-        from PyQt5.QtWidgets import QHBoxLayout, QDialogButtonBox, QCheckBox, QMessageBox
-        from PyQt5.QtWidgets import QLabel, QLineEdit, QSpinBox, QPushButton
-        from PyQt5.QtWidgets import QFontComboBox, QGroupBox, QComboBox
-        from PyQt5.QtWidgets import QGridLayout
-        from PyQt5.QtWidgets import QTabWidget, QRadioButton, QButtonGroup, QSplitter
-        from PyQt5.QtWidgets import QStyleFactory, QScrollArea, QAction
-        from PyQt5.QtWidgets import QToolBar, QActionGroup
-        from PyQt5.QtWidgets import QInputDialog, QMenu
-        from PyQt5.QtWidgets import QFontDialog, QSizePolicy, QToolButton
-        from PyQt5.QtWidgets import QFormLayout, QStackedWidget, QFrame, QItemDelegate
-        from PyQt5.QtWidgets import QTableView, QStackedWidget
-        from PyQt5.QtWidgets import QStyle
-        from PyQt5.QtWidgets import QTextEdit
-        from PyQt5.QtWidgets import QToolTip, QPlainTextEdit
-        from PyQt5.QtWidgets import QProgressBar, QAbstractItemDelegate
-        from PyQt5.QtWidgets import QColorDialog, QCompleter, QDateEdit, QDateTimeEdit
-        from PyQt5.QtWidgets import QTreeWidgetItem, QFileSystemModel
-        from PyQt5.QtWidgets import QSpacerItem, QFileIconProvider, QHeaderView, QAbstractItemView
-        from PyQt5.QtWidgets import QTabBar, QSplashScreen
-        from PyQt5.QtWidgets import QFileDialog, QTreeWidget, QTreeView
-        from PyQt5.QtWidgets import QStylePainter, QStyleOptionFrame
-        from PyQt5.QtCore import QSortFilterProxyModel
-        from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
-        from PyQt5.QtPrintSupport import QPrintPreviewDialog
 
+if os.environ['QT_API'] == 'pyqt5':
+    from PyQt5.QtCore import QSortFilterProxyModel            # analysis:ignore
+    from PyQt5.QtPrintSupport import (QPrinter, QPrintDialog, # analysis:ignore
+                                      QAbstractPrintDialog)
+    from PyQt5.QtPrintSupport import QPrintPreviewDialog      # analysis:ignore
+    from PyQt5.QtGui import *                                 # analysis:ignore
+    from PyQt5.QtWidgets import *                             # analysis:ignore
+elif os.environ['QT_API'] == 'pyqt':
+    from PyQt4.Qt import QKeySequence, QTextCursor            # analysis:ignore
+    from PyQt4.QtGui import *                                 # analysis:ignore
 else:
-    from PySide.QtGui import *  # analysis:ignore
+    from PySide.QtGui import *                                # analysis:ignore

spyderlib/qt/QtSvg.py

@@ -5,13 +5,10 @@
 # (see spyderlib/__init__.py for details)
 
 import os
-import sys
-
-if os.environ['QT_API'] == 'pyqt':
-    if "PyQt4" in sys.modules:
-        from PyQt4.QtSvg import *  # analysis:ignore
-    elif "PyQt5" in sys.modules:
-        from PyQt5.QtSvg import *  # analysis:ignore
 
+if os.environ['QT_API'] == 'pyqt5':
+    from PyQt5.QtSvg import *                                 # analysis:ignore
+elif os.environ['QT_API'] == 'pyqt':
+    from PyQt4.QtSvg import *                                 # analysis:ignore
 else:
-    from PySide.QtSvg import *  # analysis:ignore
+    from PySide.QtSvg import *                                # analysis:ignore

spyderlib/qt/QtWebKit.py

@@ -5,14 +5,12 @@
 # (see spyderlib/__init__.py for details)
 
 import os
-import sys
-
-if os.environ['QT_API'] == 'pyqt':
-    if "PyQt4" in sys.modules:
-        from PyQt4.QtWebKit import QWebPage, QWebView, QWebSettings
-    elif "PyQt5" in sys.modules:
-        from PyQt5.QtWebKitWidgets import QWebPage, QWebView
-        from PyQt5.QtWebKit import QWebSettings
 
+if os.environ['QT_API'] == 'pyqt5':
+    from PyQt5.QtWebKitWidgets import QWebPage, QWebView      # analysis:ignore
+    from PyQt5.QtWebKit import QWebSettings                   # analysis:ignore
+elif os.environ['QT_API'] == 'pyqt':
+    from PyQt4.QtWebKit import (QWebPage, QWebView,           # analysis:ignore
+                                QWebSettings)
 else:
-    from PySide.QtWebKit import *  # analysis:ignore
+    from PySide.QtWebKit import *                             # analysis:ignore

spyderlib/qt/__init__.py

@@ -10,15 +10,22 @@
 import os
 
 os.environ.setdefault('QT_API', 'pyqt')
-assert os.environ['QT_API'] in ('pyqt', 'pyside')
+assert os.environ['QT_API'] in ('pyqt5', 'pyqt', 'pyside')
 
 API = os.environ['QT_API']
-#API_NAME = {'pyqt': 'PyQt4', 'pyside': 'PySide'}[API]
+API_NAME = {'pyqt5': 'PyQt5', 'pyqt': 'PyQt4', 'pyside': 'PySide'}[API]
 
 PYQT5 = False
 
-
-if API == 'pyqt':
+if API == 'pyqt5':
+    try:
+        from PyQt5.QtCore import PYQT_VERSION_STR as __version__
+        is_old_pyqt = False
+        is_pyqt46 = False
+        PYQT5 = True
+    except ImportError:
+        pass
+elif API == 'pyqt':
     # 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+
@@ -32,27 +39,20 @@
         pass
 
     try:
-        from PyQt4.QtCore import PYQT_VERSION_STR as __version__
+        from PyQt4.QtCore import PYQT_VERSION_STR as __version__ # analysis:ignore
+    except ImportError:
+        # Switching to PySide
+        API = os.environ['QT_API'] = 'pyside'
+        API_NAME = 'PySide'
+    else:
         is_old_pyqt = __version__.startswith(('4.4', '4.5', '4.6', '4.7'))
         is_pyqt46 = __version__.startswith('4.6')
-        API_NAME = 'PyQt4'
         import sip
         try:
-
             API_NAME += (" (API v%d)" % sip.getapi('QString'))
         except AttributeError:
             pass
 
-    except ImportError:
-        try:
-            from PyQt5.QtCore import PYQT_VERSION_STR as __version__
-            is_pyqt46 = False
-            API_NAME = 'PyQt5'
-            PYQT5 = True
-        except:
-            # Switching to PySide
-            API = os.environ['QT_API'] = 'pyside'
-            API_NAME = 'PySide'
 
 if API == 'pyside':
     try:

spyderlib/qt/compat.py

@@ -33,13 +33,12 @@
 
 PYQT_API_1 = False
 if os.environ['QT_API'] == 'pyqt':
-    if 'PyQt4' in sys.modules:
-        import sip
-        try:
-            PYQT_API_1 = sip.getapi('QVariant') == 1 # PyQt API #1
-        except AttributeError:
-            # PyQt <v4.6
-            PYQT_API_1 = True
+    import sip
+    try:
+        PYQT_API_1 = sip.getapi('QVariant') == 1 # PyQt API #1
+    except AttributeError:
+        # PyQt <v4.6
+        PYQT_API_1 = True
     def to_qvariant(pyobj=None):
         """Convert Python object to QVariant
         This is a transitional function from PyQt API #1 (QVariant exist) 

spyderlib/requirements.py

@@ -35,17 +35,17 @@ def check_path():
 
 def check_qt():
     """Check Qt binding requirements"""
-    if "PyQt4" in sys.modules:
-        qt_infos = dict(pyqt=("PyQt4", "4.6"), pyside=("PySide", "1.2.0"))
-        try:
-            from spyderlib import qt
-            package_name, required_ver = qt_infos[qt.API]
-            actual_ver = qt.__version__
-            if LooseVersion(actual_ver) < LooseVersion(required_ver):
-                show_warning("Please check Spyder installation requirements:\n"
-                             "%s %s+ is required (found v%s)."
-                             % (package_name, required_ver, actual_ver))
-        except ImportError:
+    qt_infos = dict(pyqt5=("PyQt5", "5.2"), pyqt=("PyQt4", "4.6"),
+                    pyside=("PySide", "1.2.0"))
+    try:
+        from spyderlib import qt
+        package_name, required_ver = qt_infos[qt.API]
+        actual_ver = qt.__version__
+        if LooseVersion(actual_ver) < LooseVersion(required_ver):
             show_warning("Please check Spyder installation requirements:\n"
-                         "%s %s+ (or %s %s+) is required."
-                         % (qt_infos['pyqt']+qt_infos['pyside']))
+                         "%s %s+ is required (found v%s)."
+                         % (package_name, required_ver, actual_ver))
+    except ImportError:
+        show_warning("Please check Spyder installation requirements:\n"
+                     "%s %s+ (or %s %s+) is required."
+                     % (qt_infos['pyqt']+qt_infos['pyside']))

spyderlib/widgets/externalshell/sitecustomize.py

@@ -263,16 +263,14 @@ def open_in_spyder(source, lineno=1):
     #   * Installing an input hook: this feature is not yet supported 
     #     natively by PySide
     if os.environ.get("INSTALL_QT_INPUTHOOK", "").lower() == "true":
-        if os.environ["QT_API"] == 'pyqt':
-            if 'PyQt4' in sys.modules:
-                from PyQt4 import QtCore
-                # Removing PyQt's PyOS_InputHook implementation:
-                QtCore.pyqtRemoveInputHook()
-            elif 'PyQt5' in sys.modules:
-                from PyQt5 import QtCore
-                # Removing PyQt's PyOS_InputHook implementation:
-                QtCore.pyqtRemoveInputHook()
-
+        if os.environ["QT_API"] == 'pyqt5':
+            from PyQt5 import QtCore
+            # Removing PyQt's PyOS_InputHook implementation:
+            QtCore.pyqtRemoveInputHook()
+        elif os.environ["QT_API"] == 'pyqt':
+            from PyQt4 import QtCore
+            # Removing PyQt's PyOS_InputHook implementation:
+            QtCore.pyqtRemoveInputHook()
         elif os.environ["QT_API"] == 'pyside':
             from PySide import QtCore
             # XXX: when PySide will implement an input hook, we will have to