Add support for PyQt6

DiscoverOctoPrintAction.py

@@ -12,15 +12,26 @@
 from cura.MachineAction import MachineAction
 from cura.Settings.CuraStackBuilder import CuraStackBuilder
 
-from PyQt5.QtCore import pyqtSignal, pyqtProperty, pyqtSlot, QUrl, QObject, QTimer
-from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtNetwork import (
-    QNetworkRequest,
-    QNetworkAccessManager,
-    QNetworkReply,
-    QSslConfiguration,
-    QSslSocket,
-)
+try:
+    from PyQt6.QtCore import pyqtSignal, pyqtProperty, pyqtSlot, QUrl, QObject, QTimer
+    from PyQt6.QtGui import QDesktopServices
+    from PyQt6.QtNetwork import (
+        QNetworkRequest,
+        QNetworkAccessManager,
+        QNetworkReply,
+        QSslConfiguration,
+        QSslSocket,
+    )
+except ImportError:
+    from PyQt5.QtCore import pyqtSignal, pyqtProperty, pyqtSlot, QUrl, QObject, QTimer
+    from PyQt5.QtGui import QDesktopServices
+    from PyQt5.QtNetwork import (
+        QNetworkRequest,
+        QNetworkAccessManager,
+        QNetworkReply,
+        QSslConfiguration,
+        QSslSocket,
+    )
 
 from .NetworkReplyTimeout import NetworkReplyTimeout
 from .PowerPlugins import PowerPlugins

NetworkMJPGImage.py

@@ -1,16 +1,28 @@
 # Copyright (c) 2021 Aldo Hoeben / fieldOfView
 # NetworkMJPGImage is released under the terms of the LGPLv3 or higher.
 
-from PyQt5.QtCore import QUrl, pyqtProperty, pyqtSignal, pyqtSlot, QRect, QByteArray
-from PyQt5.QtGui import QImage, QPainter
-from PyQt5.QtQuick import QQuickPaintedItem
-from PyQt5.QtNetwork import (
-    QNetworkRequest,
-    QNetworkReply,
-    QNetworkAccessManager,
-    QSslConfiguration,
-    QSslSocket,
-)
+try:
+    from PyQt6.QtCore import QUrl, pyqtProperty, pyqtSignal, pyqtSlot, QRect, QByteArray
+    from PyQt6.QtGui import QImage, QPainter
+    from PyQt6.QtQuick import QQuickPaintedItem
+    from PyQt6.QtNetwork import (
+        QNetworkRequest,
+        QNetworkReply,
+        QNetworkAccessManager,
+        QSslConfiguration,
+        QSslSocket,
+    )
+except ImportError:
+    from PyQt5.QtCore import QUrl, pyqtProperty, pyqtSignal, pyqtSlot, QRect, QByteArray
+    from PyQt5.QtGui import QImage, QPainter
+    from PyQt5.QtQuick import QQuickPaintedItem
+    from PyQt5.QtNetwork import (
+        QNetworkRequest,
+        QNetworkReply,
+        QNetworkAccessManager,
+        QSslConfiguration,
+        QSslSocket,
+    )
 
 from UM.Logger import Logger
 

NetworkReplyTimeout.py

@@ -1,8 +1,12 @@
 # Copyright (c) 2021 Aldo Hoeben / fieldOfView
 # NetworkReplyTimeout is released under the terms of the AGPLv3 or higher.
 
-from PyQt5.QtCore import QObject, QTimer
-from PyQt5.QtNetwork import QNetworkReply
+try:
+    from PyQt6.QtCore import QObject, QTimer
+    from PyQt6.QtNetwork import QNetworkReply
+except ImportError:
+    from PyQt5.QtCore import QObject, QTimer
+    from PyQt5.QtNetwork import QNetworkReply
 
 from UM.Signal import Signal
 

OctoPrintOutputDevice.py

@@ -34,22 +34,40 @@
 
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import NetworkedPrinterOutputDevice
 
-from PyQt5.QtNetwork import (
-    QHttpMultiPart,
-    QHttpPart,
-    QNetworkRequest,
-    QNetworkAccessManager,
-)
-from PyQt5.QtNetwork import QNetworkReply, QSslConfiguration, QSslSocket
-from PyQt5.QtCore import (
-    QUrl,
-    QTimer,
-    pyqtSignal,
-    pyqtProperty,
-    pyqtSlot,
-    QCoreApplication,
-)
-from PyQt5.QtGui import QImage, QDesktopServices
+try:
+    from PyQt6.QtNetwork import (
+        QHttpMultiPart,
+        QHttpPart,
+        QNetworkRequest,
+        QNetworkAccessManager,
+    )
+    from PyQt6.QtNetwork import QNetworkReply, QSslConfiguration, QSslSocket
+    from PyQt6.QtCore import (
+        QUrl,
+        QTimer,
+        pyqtSignal,
+        pyqtProperty,
+        pyqtSlot,
+        QCoreApplication,
+    )
+    from PyQt6.QtGui import QImage, QDesktopServices
+except ImportError:
+    from PyQt6.QtNetwork import (
+        QHttpMultiPart,
+        QHttpPart,
+        QNetworkRequest,
+        QNetworkAccessManager,
+    )
+    from PyQt6.QtNetwork import QNetworkReply, QSslConfiguration, QSslSocket
+    from PyQt6.QtCore import (
+        QUrl,
+        QTimer,
+        pyqtSignal,
+        pyqtProperty,
+        pyqtSlot,
+        QCoreApplication,
+    )
+    from PyQt6.QtGui import QImage, QDesktopServices
 
 import json
 import os.path

OctoPrintOutputDevicePlugin.py

@@ -10,7 +10,10 @@
 from UM.Util import parseBool
 from UM.Settings.ContainerStack import ContainerStack
 
-from PyQt5.QtCore import QTimer
+try:
+    from PyQt6.QtCore import QTimer
+except ImportError:
+    from PyQt5.QtCore import QTimer
 
 import time
 import json

UploadOptions.py

@@ -5,7 +5,10 @@
 from UM.Version import Version
 from UM.Util import parseBool
 
-from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot
+try:
+    from PyQt6.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot
+except ImportError:
+    from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot
 
 import os.path
 

WebcamsModel.py

@@ -1,7 +1,10 @@
 # Copyright (c) 2021 Aldo Hoeben / fieldOfView
 # OctoPrintPlugin is released under the terms of the AGPLv3 or higher.
 
-from PyQt5.QtCore import Qt
+try:
+    from PyQt6.QtCore import Qt
+except ImportError:
+    from PyQt5.QtCore import Qt
 
 from UM.Qt.ListModel import ListModel
 from UM.Logger import Logger

__init__.py

@@ -11,8 +11,10 @@
 from UM.Application import Application
 from UM.Logger import Logger
 
-from PyQt5.QtQml import qmlRegisterType
-
+try:
+    from PyQt6.QtQml import qmlRegisterType
+except ImportError:
+    from PyQt5.QtQml import qmlRegisterType
 
 def getMetaData():
     return {}

plugin.json

@@ -4,6 +4,6 @@
     "version": "3.6.1-DEV",
     "description": "Enables networked printing and monitoring with OctoPrint",
     "api": 5,
-    "supported_sdk_versions": ["5.0.0", "6.0.0", "7.0.0"],
+    "supported_sdk_versions": ["5.0.0", "6.0.0", "7.0.0", "8.0.0"],
     "i18n-catalog": "octoprint"
 }