Use the already defined constants to differentiate between Qt apis.

qtpy/QtCore.py

@@ -10,20 +10,19 @@
 Provides QtCore classes and functions.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtCore import *
     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 API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtCore import *
     from PyQt4.QtCore import QCoreApplication
     from PyQt4.QtCore import Qt
@@ -33,7 +32,7 @@
     from PyQt4.QtGui import (QItemSelection, QItemSelectionModel,
                              QItemSelectionRange, QSortFilterProxyModel)
     from PyQt4.QtCore import QT_VERSION_STR as __version__
-elif API in PYSIDE_API:
+elif PYSIDE:
     from PySide.QtCore import *
     from PySide.QtGui import (QItemSelection, QItemSelectionModel,
                               QItemSelectionRange, QSortFilterProxyModel)

qtpy/QtDesigner.py

@@ -9,15 +9,14 @@
 Provides QtDesigner classes and functions.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
+from qtpy import PYQT5
+from qtpy import PYQT4
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtDesigner import *
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtDesigner import *
 else:
     raise PythonQtError('No Qt bindings could be found')

qtpy/QtGui.py

@@ -13,16 +13,15 @@
     the ``PyQt5.QtGui`` module.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtGui import *
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.Qt import QKeySequence, QTextCursor
     from PyQt4.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,
                              QBrush, QClipboard, QCloseEvent, QColor,
@@ -63,7 +62,7 @@
                              QWindowStateChangeEvent, qAlpha, qBlue,
                              qFuzzyCompare, qGray, qGreen, qIsGray, qRed, qRgb,
                              qRgba, QIntValidator)
-elif API in PYSIDE_API:
+elif PYSIDE:
     from PySide.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,
                               QBrush, QClipboard, QCloseEvent, QColor,
                               QConicalGradient, QContextMenuEvent, QCursor,

qtpy/QtNetwork.py

@@ -10,18 +10,17 @@
 Provides QtNetwork classes and functions.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtNetwork import *
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtNetwork import *
-elif API in PYSIDE_API:
+elif PYSIDE:
     from PySide.QtNetwork import *
 else:
     raise PythonQtError('No Qt bindings could be found')

qtpy/QtPrintSupport.py

@@ -9,20 +9,19 @@
 Provides QtPrintSupport classes and functions.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtPrintSupport import *
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtGui import (QAbstractPrintDialog, QPageSetupDialog,
                              QPrintDialog, QPrintEngine, QPrintPreviewDialog,
                              QPrintPreviewWidget, QPrinter, QPrinterInfo)
-elif API in PYSIDE_API:
+elif PYSIDE:
     from PySide.QtGui import (QAbstractPrintDialog, QPageSetupDialog,
                               QPrintDialog, QPrintEngine, QPrintPreviewDialog,
                               QPrintPreviewWidget, QPrinter, QPrinterInfo)

qtpy/QtSvg.py

@@ -8,18 +8,17 @@
 Provides QtSvg classes and functions.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtSvg import *
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtSvg import *
-elif API in PYSIDE_API:
+elif PYSIDE:
     from PySide.QtSvg import *
 else:
     raise PythonQtError('No Qt bindings could be found')

qtpy/QtTest.py

@@ -12,23 +12,22 @@
     running with PySide.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtTest import QTest
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtTest import QTest as OldQTest
 
     class QTest(OldQTest):
         @staticmethod
         def qWaitForWindowActive(QWidget):
             OldQTest.qWaitForWindowShown(QWidget)
-elif API in PYSIDE_API:
+elif PYSIDE:
     raise ImportError('QtTest support is incomplete for PySide')
 else:
     raise PythonQtError('No Qt bindings could be found')

qtpy/QtWebEngineWidgets.py

@@ -10,18 +10,17 @@
 Provides QtWebEngineWidgets classes and functions.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
 # To test if we are using WebEngine or WebKit
 WEBENGINE = True
 
 
-if API in PYQT5_API:
+if PYQT5:
     try:
         from PyQt5.QtWebEngineWidgets import QWebEnginePage
         from PyQt5.QtWebEngineWidgets import QWebEngineView
@@ -31,12 +30,12 @@
         from PyQt5.QtWebKitWidgets import QWebView as QWebEngineView
         from PyQt5.QtWebKit import QWebSettings as QWebEngineSettings
         WEBENGINE = False
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtWebKit import QWebPage as QWebEnginePage
     from PyQt4.QtWebKit import QWebView as QWebEngineView
     from PyQt4.QtWebKit import QWebSettings as QWebEngineSettings
     WEBENGINE = False
-elif API in PYSIDE_API:
+elif PYSIDE:
     from PySide.QtWebKit import QWebPage as QWebEnginePage
     from PySide.QtWebKit import QWebView as QWebEngineView
     from PySide.QtWebKit import QWebSettings as QWebEngineSettings

qtpy/QtWidgets.py

@@ -13,16 +13,15 @@
     were the ``PyQt5.QtWidgets`` module.
 """
 
-from qtpy import API
-from qtpy import PYQT5_API
-from qtpy import PYQT4_API
-from qtpy import PYSIDE_API
+from qtpy import PYQT5
+from qtpy import PYQT4
+from qtpy import PYSIDE
 from qtpy import PythonQtError
 
 
-if API in PYQT5_API:
+if PYQT5:
     from PyQt5.QtWidgets import *
-elif API in PYQT4_API:
+elif PYQT4:
     from PyQt4.QtGui import *
     QStyleOptionViewItem = QStyleOptionViewItemV4
 
@@ -62,7 +61,7 @@
 
     # These objects belong to QtCore
     del (QItemSelection, QItemSelectionRange, QSortFilterProxyModel)
-elif API in PYSIDE_API:
+elif PYSIDE:
     from PySide.QtGui import *
     QStyleOptionViewItem = QStyleOptionViewItemV4
 

qtpy/compat.py

@@ -11,7 +11,7 @@
 import sys
 import collections
 
-from qtpy import API, PYQT4_API
+from qtpy import PYQT4
 from qtpy.QtWidgets import QFileDialog
 from qtpy.py3compat import is_text_string, to_text_string, TEXT_TYPES
 
@@ -20,7 +20,7 @@
 # QVariant conversion utilities
 # =============================================================================
 PYQT_API_1 = False
-if API in PYQT4_API:
+if PYQT4:
     import sip
     try:
         PYQT_API_1 = sip.getapi('QVariant') == 1  # PyQt API #1