PR: Add PySide2 support

.gitignore

@@ -34,3 +34,4 @@ lib64
 # Other files
 toread.md
 .chache
+.idea/

qtpy/QtCore.py

@@ -10,7 +10,7 @@
 Provides QtCore classes and functions.
 """
 
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
 
 
 if PYQT5:
@@ -22,6 +22,8 @@
 
     # Those are imported from `import *`
     del pyqtSignal, pyqtSlot, pyqtProperty, QT_VERSION_STR
+elif PYSIDE2:
+    from PySide2.QtCore import *
 elif PYQT4:
     from PyQt4.QtCore import *
     # Those are things we inherited from Spyder that fix crazy crashes under

qtpy/QtGui.py

@@ -13,11 +13,13 @@
     the ``PyQt5.QtGui`` module.
 """
 
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYQT4, PYSIDE, PYSIDE2, PythonQtError
 
 
 if PYQT5:
     from PyQt5.QtGui import *
+elif PYSIDE2:
+    from PySide2.QtGui import *
 elif PYQT4:
     from PyQt4.Qt import QKeySequence, QTextCursor
     from PyQt4.QtGui import (QAbstractTextDocumentLayout, QActionEvent, QBitmap,

qtpy/QtMultimedia.py

@@ -1,10 +1,13 @@
 from . import PYQT5
 from . import PYQT4
 from . import PYSIDE
+from . import PYSIDE2
 
 
 if PYQT5:
     from PyQt5.QtMultimedia import *
+elif PYSIDE2:
+    from PySide2.QtMultimedia import *
 elif PYQT4:
     from PyQt4.QtMultimedia import *
     from PyQt4.QtGui import QSound

qtpy/QtNetwork.py

@@ -10,11 +10,13 @@
 Provides QtNetwork classes and functions.
 """
 
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
 
 
 if PYQT5:
     from PyQt5.QtNetwork import *
+elif PYSIDE2:
+    from PySide2.QtNetwork import *
 elif PYQT4:
     from PyQt4.QtNetwork import *
 elif PYSIDE:

qtpy/QtPrintSupport.py

@@ -9,11 +9,13 @@
 Provides QtPrintSupport classes and functions.
 """
 
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYQT4,PYSIDE2, PYSIDE, PythonQtError
 
 
 if PYQT5:
     from PyQt5.QtPrintSupport import *
+elif PYSIDE2:
+    from PySide2.QtPrintSupport import *
 elif PYQT4:
     from PyQt4.QtGui import (QAbstractPrintDialog, QPageSetupDialog,
                              QPrintDialog, QPrintEngine, QPrintPreviewDialog,

qtpy/QtSvg.py

@@ -8,11 +8,14 @@
 """Provides QtSvg classes and functions."""
 
 # Local imports
-from . import PYQT4, PYQT5, PYSIDE, PythonQtError
+from . import PYQT4, PYSIDE2, PYQT5, PYSIDE, PythonQtError
 
 if PYQT5:
     from PyQt5.QtSvg import (QGraphicsSvgItem, QSvgGenerator, QSvgRenderer,
                              QSvgWidget)
+elif PYSIDE2:
+    from PySide2.QtSvg import (QGraphicsSvgItem, QSvgGenerator, QSvgRenderer,
+                             QSvgWidget)
 elif PYQT4:
     from PyQt4.QtSvg import (QGraphicsSvgItem, QSvgGenerator, QSvgRenderer,
                              QSvgWidget)
@@ -22,4 +25,4 @@
 else:
     raise PythonQtError('No Qt bindings could be found')
 
-del PYQT4, PYQT5, PYSIDE
+del PYQT4, PYQT5, PYSIDE, PYSIDE2

qtpy/QtTest.py

@@ -10,11 +10,13 @@
 Provides QtTest and functions
 """
 
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5,PYSIDE2, PYQT4, PYSIDE, PythonQtError
 
 
 if PYQT5:
     from PyQt5.QtTest import QTest
+elif PYSIDE2:
+    from PySide2.QtTest import QTest
 elif PYQT4:
     from PyQt4.QtTest import QTest as OldQTest
 

qtpy/QtWebEngineWidgets.py

@@ -10,7 +10,7 @@
 Provides QtWebEngineWidgets classes and functions.
 """
 
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5,PYSIDE2, PYQT4, PYSIDE, PythonQtError
 
 
 # To test if we are using WebEngine or WebKit
@@ -27,6 +27,18 @@
         from PyQt5.QtWebKitWidgets import QWebView as QWebEngineView
         from PyQt5.QtWebKit import QWebSettings as QWebEngineSettings
         WEBENGINE = False
+elif PYSIDE2:
+    try:
+        from PySide2.QtWebEngineWidgets import QWebEnginePage
+        from PySide2.QtWebEngineWidgets import QWebEngineView
+        from PySide2.QtWebEngineWidgets import QWebEngineSettings
+    except ImportError:
+        from PySide2.QtWebKitWidgets import QWebPage as QWebEnginePage
+        from PySide2.QtWebKitWidgets import QWebView as QWebEngineView
+        #: Current PySide2 builds seem to be missing this.
+        #: I'll leave it in for now because the final builds should have it
+        from PySide2.QtWebKit import QWebSettings as QWebEngineSettings
+        WEBENGINE = False
 elif PYQT4:
     from PyQt4.QtWebKit import QWebPage as QWebEnginePage
     from PyQt4.QtWebKit import QWebView as QWebEngineView

qtpy/QtWidgets.py

@@ -13,13 +13,15 @@
     were the ``PyQt5.QtWidgets`` module.
 """
 
-from . import PYQT5, PYQT4, PYSIDE, PythonQtError
+from . import PYQT5, PYSIDE2, PYQT4, PYSIDE, PythonQtError
 from ._patch.qcombobox import patch_qcombobox
 from ._patch.qheaderview import introduce_renamed_methods_qheaderview
 
 
 if PYQT5:
     from PyQt5.QtWidgets import *
+elif PYSIDE2:
+    from PySide2.QtWidgets import *
 elif PYQT4:
     from PyQt4.QtGui import *
     QStyleOptionViewItem = QStyleOptionViewItemV4

qtpy/__init__.py

@@ -26,6 +26,17 @@
     >>> print(QtWidgets.QWidget)
 
 
+PySide2
+======
+
+Set the QT_API environment variable to 'pyside2' before importing other
+packages::
+
+    >>> import os
+    >>> os.environ['QT_API'] = 'pyside2'
+    >>> from qtpy import QtGui, QtWidgets, QtCore
+    >>> print(QtWidgets.QWidget)
+
 PyQt4
 =====
 
@@ -66,14 +77,16 @@
 ]
 #: names of the expected PySide api
 PYSIDE_API = ['pyside']
+#: names of the expected PySide2 api
+PYSIDE2_API = ['pyside2']
 
 os.environ.setdefault(QT_API, 'pyqt5')
 API = os.environ[QT_API].lower()
-assert API in (PYQT5_API + PYQT4_API + PYSIDE_API)
+assert API in (PYQT5_API + PYQT4_API + PYSIDE_API+PYSIDE2_API)
 
 is_old_pyqt = is_pyqt46 = False
 PYQT5 = True
-PYQT4 = PYSIDE = False
+PYQT4 = PYSIDE = PYSIDE2 = False
 
 
 class PythonQtError(Exception):
@@ -89,6 +102,17 @@ class PythonQtError(Exception):
     except ImportError:
         API = os.environ['QT_API'] = 'pyqt'
 
+if API in PYSIDE2_API:
+    try:
+        from PySide2 import __version__ as PYSIDE_VERSION  # analysis:ignore
+        from PySide2.QtCore import __version__ as QT_VERSION  # analysis:ignore
+
+        PYQT_VERSION = None
+        PYQT5 = False
+        PYSIDE2 = True
+    except ImportError:
+        API = os.environ['QT_API'] = 'pyqt4'
+
 if API in PYQT4_API:
     try:
         import sip
@@ -119,13 +143,13 @@ class PythonQtError(Exception):
         from PySide import __version__ as PYSIDE_VERSION  # analysis:ignore
         from PySide.QtCore import __version__ as QT_VERSION  # analysis:ignore
         PYQT_VERSION = None
-        PYQT5 = False
+        PYQT5 = PYSIDE2 = False
         PYSIDE = True
     except ImportError:
         raise PythonQtError('No Qt bindings could be found')
 
 API_NAME = {'pyqt5': 'PyQt5', 'pyqt': 'PyQt4', 'pyqt4': 'PyQt4',
-            'pyside': 'PySide'}[API]
+            'pyside': 'PySide', 'pyside2':'PySide2'}[API]
 if PYQT4:
         import sip
         try:

qtpy/tests/conftest.py

@@ -54,6 +54,18 @@ def pytest_report_header(config):
     except AttributeError:
         versions += 'unknown version'
 
+    versions += os.linesep
+    versions += 'PySide2: '
+
+    try:
+        import PySide2
+        from PySide2 import QtCore
+        versions += "PySide: {0} - Qt: {1}".format(PySide2.__version__, QtCore.__version__)
+    except ImportError:
+        versions += 'not installed'
+    except AttributeError:
+        versions += 'unknown version'
+
     versions += os.linesep
 
     return versions

qtpy/tests/test_main.py

@@ -13,6 +13,16 @@ def assert_pyside():
     assert QtWidgets.QWidget is PySide.QtGui.QWidget
     assert QtWebEngineWidgets.QWebEnginePage is PySide.QtWebKit.QWebPage
 
+def assert_pyside2():
+    """
+    Make sure that we are using PySide
+    """
+    import PySide2
+    assert QtCore.QEvent is PySide2.QtCore.QEvent
+    assert QtGui.QPainter is PySide2.QtGui.QPainter
+    assert QtWidgets.QWidget is PySide2.QtGui.QWidget
+    # The current builds of PySide2 don't seem to have this yet
+    # assert QtWebEngineWidgets.QWebEnginePage is PySide2.QtWebKit.QWebPage
 
 def assert_pyqt4():
     """
@@ -52,6 +62,8 @@ def test_qt_api():
         assert_pyqt4()
     elif QT_API == 'pyqt5':
         assert_pyqt5()
+    elif QT_API == 'pyside2':
+        assert_pyside2()
     else:
         # If the tests are run locally, USE_QT_API and QT_API may not be
         # defined, but we still want to make sure qtpy is behaving sensibly.

qtpy/uic.py

@@ -1,6 +1,6 @@
 import os
 
-from . import PYSIDE, PYQT4, PYQT5
+from . import PYSIDE, PYSIDE2, PYQT4, PYQT5
 from .QtWidgets import QComboBox
 
 __all__ = ['loadUi']
@@ -13,7 +13,7 @@
 
     from PyQt4.uic import loadUi
 
-elif PYSIDE:
+else:
 
     # In PySide, loadUi does not exist, so we define it using QUiLoader, and
     # then make sure we expose that function. This is adapted from qt-helpers
@@ -77,8 +77,12 @@
     # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     # DEALINGS IN THE SOFTWARE.
 
-    from PySide.QtCore import QMetaObject
-    from PySide.QtUiTools import QUiLoader
+    if PYSIDE:
+        from PySide.QtCore import QMetaObject
+        from PySide.QtUiTools import QUiLoader
+    elif PYSIDE2:
+        from PySide2.QtCore import QMetaObject
+        from PySide2.QtUiTools import QUiLoader
 
     class UiLoader(QUiLoader):
         """