Merge pull request #255 from jschueller/pyqt6

PR: Add additional Qt modules and more support and tests for PyQt6/PySide6

qtpy/Qt3DCore.py

@@ -7,10 +7,14 @@
 """Provides Qt3DCore classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     from PyQt5.Qt3DCore import *
+elif PYQT6:
+    from PyQt6.Qt3DCore import *
+elif PYSIDE6:
+    from PySide6.Qt3DCore.Qt3DCore import *
 elif PYSIDE2:
     # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
     import PySide2.Qt3DCore as __temp

qtpy/Qt3DExtras.py

@@ -7,10 +7,14 @@
 """Provides Qt3DExtras classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     from PyQt5.Qt3DExtras import *
+elif PYQT6:
+    from PyQt6.Qt3DExtras import *
+elif PYSIDE6:
+    from PySide6.Qt3DExtras.Qt3DExtras import *
 elif PYSIDE2:
     # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
     import PySide2.Qt3DExtras as __temp

qtpy/Qt3DInput.py

@@ -7,10 +7,14 @@
 """Provides Qt3DInput classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     from PyQt5.Qt3DInput import *
+elif PYQT6:
+    from PyQt6.Qt3DInput import *
+elif PYSIDE6:
+    from PySide6.Qt3DInput.Qt3DInput import *
 elif PYSIDE2:
     # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
     import PySide2.Qt3DInput as __temp

qtpy/Qt3DLogic.py

@@ -7,10 +7,14 @@
 """Provides Qt3DLogic classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     from PyQt5.Qt3DLogic import *
+elif PYQT6:
+    from PyQt6.Qt3DLogic import *
+elif PYSIDE6:
+    from PySide6.Qt3DLogic.Qt3DLogic import *
 elif PYSIDE2:
     # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
     import PySide2.Qt3DLogic as __temp

qtpy/Qt3DRender.py

@@ -7,10 +7,14 @@
 """Provides Qt3DRender classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     from PyQt5.Qt3DRender import *
+elif PYSIDE6:
+    from PySide6.Qt3DRender.Qt3DRender import *
+elif PYQT6:
+    from PyQt6.Qt3DRender import *
 elif PYSIDE2:
     # https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1026
     import PySide2.Qt3DRender as __temp

qtpy/QtCharts.py

@@ -7,14 +7,18 @@
 """Provides QtChart classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     try:
         from PyQt5 import QtChart as QtCharts
     except ImportError:
         raise PythonQtError('The QtChart module was not found. '
                             'It needs to be installed separately for PyQt5.')
+elif PYQT6:
+    from PyQt6 import QtCharts
+elif PYSIDE6:
+    from PySide6 import QtCharts
 elif PYSIDE2:
     from PySide2.QtCharts import *
 else:

qtpy/QtDBus.py

@@ -0,0 +1,19 @@
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtDBus classes and functions."""
+
+# Local imports
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
+
+if PYQT5:
+    from PyQt5.QtDBus import *
+elif PYQT6:
+    from PyQt6.QtDBus import *
+elif PYSIDE6:
+    from PySide6.QtDBus import *
+else:
+    raise PythonQtError('No Qt bindings could be found')

qtpy/QtDesigner.py

@@ -8,10 +8,14 @@
 Provides QtDesigner classes and functions.
 """
 
-from . import PYQT5, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE6, PythonQtError
 
 
 if PYQT5:
     from PyQt5.QtDesigner import *
+elif PYQT6:
+    from PyQt6.QtDesigner import *
+elif PYSIDE6:
+    from PySide6.QtDesigner import *
 else:
     raise PythonQtError('No Qt bindings could be found')

qtpy/QtHelp.py

@@ -8,11 +8,15 @@
 
 import warnings
 
-from . import PYQT5, PYSIDE6, PYSIDE2
+from . import PYQT5, PYQT6, PYSIDE6, PYSIDE2, PythonQtError
 
 if PYQT5:
     from PyQt5.QtHelp import *
+elif PYQT6:
+    from PyQt6.QtHelp import *
 elif PYSIDE6:
     from PySide6.QtHelp import *
 elif PYSIDE2:
     from PySide2.QtHelp import *
+else:
+    raise PythonQtError('No Qt bindings could be found')

qtpy/QtMultimedia.py

@@ -1,12 +1,16 @@
 import warnings
 
-from . import PYQT5
+from . import PYQT5, PYQT6
 from . import PYSIDE2
 from . import PYSIDE6
 
 if PYQT5:
     from PyQt5.QtMultimedia import *
+elif PYQT6:
+    from PyQt6.QtMultimedia import *
 elif PYSIDE6:
     from PySide6.QtMultimedia import *
 elif PYSIDE2:
     from PySide2.QtMultimedia import *
+else:
+    raise PythonQtError('No Qt bindings could be found')

qtpy/QtMultimediaWidgets.py

@@ -7,11 +7,15 @@
 """Provides QtMultimediaWidgets classes and functions."""
 
 # Local imports
-from . import PYSIDE2, PYQT5, PythonQtError
+from . import PYSIDE2, PYSIDE6, PYQT5, PYQT6, PythonQtError
 
 if PYQT5:
     from PyQt5.QtMultimediaWidgets import *
+elif PYQT6:
+    from PyQt6.QtMultimediaWidgets import *
 elif PYSIDE2:
     from PySide2.QtMultimediaWidgets import *
+elif PYSIDE6:
+    from PySide6.QtMultimediaWidgets import *
 else:
     raise PythonQtError('No Qt bindings could be found')

qtpy/QtNetwork.py

@@ -9,11 +9,13 @@
 Provides QtNetwork classes and functions.
 """
 
-from . import PYQT5, PYSIDE2, PYSIDE6, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 
 if PYQT5:
     from PyQt5.QtNetwork import *
+elif PYQT6:
+    from PyQt6.QtNetwork import *
 elif PYSIDE6:
     from PySide6.QtNetwork import *
 elif PYSIDE2:

qtpy/QtNetworkAuth.py

@@ -0,0 +1,19 @@
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtNetworkAuth classes and functions."""
+
+# Local imports
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
+
+if PYQT6:
+    from PyQt6.QtNetworkAuth import *
+elif PYQT5:
+    from PyQt5.QtNetworkAuth import *
+elif PYSIDE6:
+    from PySide6.QtNetworkAuth import *
+else:
+    raise PythonQtError('No Qt bindings could be found')

qtpy/QtOpenGL.py

@@ -11,6 +11,8 @@
 
 if PYQT5:
     from PyQt5.QtOpenGL import *
+elif PYQT6:
+    from PyQt6.QtOpenGL import *
 elif PYSIDE6:
     from PySide6.QtOpenGL import *
 elif PYSIDE2:

qtpy/QtOpenGLWidgets.py

@@ -0,0 +1,17 @@
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtOpenGLWidgets classes and functions."""
+
+# Local imports
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
+
+if PYQT6:
+    from PyQt6.QtOpenGLWidgets import *
+elif PYSIDE6:
+    from PySide6.QtOpenGLWidgets import *
+else:
+    raise PythonQtError('No Qt bindings could be found')

qtpy/QtPrintSupport.py

@@ -8,11 +8,13 @@
 Provides QtPrintSupport classes and functions.
 """
 
-from . import PYQT5, PYSIDE6, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE6, PYSIDE2, PythonQtError
 
 
 if PYQT5:
     from PyQt5.QtPrintSupport import *
+elif PYQT6:
+    from PyQt6.QtPrintSupport import *
 elif PYSIDE6:
     from PySide6.QtPrintSupport import *
 elif PYSIDE2:

qtpy/QtQml.py

@@ -7,10 +7,12 @@
 """Provides QtQml classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE2, PYSIDE6, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     from PyQt5.QtQml import *
+elif PYQT6:
+    from PyQt6.QtQml import *
 elif PYSIDE6:
     from PySide6.QtQml import *
 elif PYSIDE2:

qtpy/QtQuick.py

@@ -7,10 +7,12 @@
 """Provides QtQuick classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE6, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE6, PYSIDE2, PythonQtError
 
 if PYQT5:
     from PyQt5.QtQuick import *
+elif PYQT6:
+    from PyQt6.QtQuick import *
 elif PYSIDE6:
     from PySide6.QtQuick import *
 elif PYSIDE2:

qtpy/QtQuickWidgets.py

@@ -7,10 +7,12 @@
 """Provides QtQuickWidgets classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE6, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE6, PYSIDE2, PythonQtError
 
 if PYQT5:
     from PyQt5.QtQuickWidgets import *
+elif PYQT6:
+    from PyQt6.QtQuickWidgets import *
 elif PYSIDE6:
     from PySide6.QtQuickWidgets import *
 elif PYSIDE2:

qtpy/QtRemoteObjects.py

@@ -0,0 +1,21 @@
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtRemoteObjects classes and functions."""
+
+# Local imports
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
+
+if PYQT5:
+    from PyQt5.QtRemoteObjects import *
+elif PYQT6:
+    from PyQt6.QtRemoteObjects import *
+elif PYSIDE6:
+    from PySide6.QtRemoteObjects import *
+elif PYSIDE2:
+    from PySide2.QtRemoteObjects import *
+else:
+    raise PythonQtError('No Qt bindings could be found')

qtpy/QtSensors.py

@@ -0,0 +1,21 @@
+# -----------------------------------------------------------------------------
+# Copyright © 2009- The Spyder Development Team
+#
+# Licensed under the terms of the MIT License
+# (see LICENSE.txt for details)
+# -----------------------------------------------------------------------------
+"""Provides QtSensors classes and functions."""
+
+# Local imports
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
+
+if PYQT5:
+    from PyQt5.QtSensors import *
+elif PYQT6:
+    from PyQt6.QtSensors import *
+elif PYSIDE6:
+    from PySide6.QtSensors import *
+elif PYSIDE2:
+    from PySide2.QtSensors import *
+else:
+    raise PythonQtError('No Qt bindings could be found')

qtpy/QtSerialPort.py

@@ -8,9 +8,15 @@
 """Provides QtSerialPort classes and functions."""
 
 # Local imports
-from . import PYQT5, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE2, PYSIDE6, PythonQtError
 
 if PYQT5:
     from PyQt5.QtSerialPort import *
+elif PYQT6:
+    from PyQt6.QtSerialPort import *
+elif PYSIDE6:
+    from PySide6.QtSerialPort import *
+elif PYSIDE2:
+    from PySide2.QtSerialPort import *
 else:
     raise PythonQtError('No Qt bindings could be found')

qtpy/QtSql.py

@@ -7,10 +7,12 @@
 """Provides QtSql classes and functions."""
 
 # Local imports
-from . import PYQT5, PYSIDE6, PYSIDE2, PythonQtError
+from . import PYQT5, PYQT6, PYSIDE6, PYSIDE2, PythonQtError
 
 if PYQT5:
     from PyQt5.QtSql import *
+elif PYQT6:
+    from PyQt6.QtSql import *
 elif PYSIDE6:
     from PySide6.QtSql import *
 elif PYSIDE2:

qtpy/QtWebChannel.py

@@ -7,10 +7,12 @@
 """Provides QtWebChannel classes and functions."""
 
 # Local imports
-from . import PYSIDE2, PYSIDE6, PYQT5, PythonQtError
+from . import PYSIDE2, PYSIDE6, PYQT5, PYQT6, PythonQtError
 
 if PYQT5:
     from PyQt5.QtWebChannel import *
+elif PYQT6:
+    from PyQt6.QtWebChannel import *
 elif PYSIDE6:
     from PySide6.QtWebChannel import *
 elif PYSIDE2: