Mercurial Repositories > MQTT Monitor / changeset
changeset
Adapted some import statements to eric 23.1 and newer.
Tue, 20 Dec 2022 16:32:09 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 20 Dec 2022 16:32:09 +0100
- branch
- eric7
- changeset 129
- 9d54bf366323
- parent 128
- dea03e2813dc
- child 130
- 25a385248b3c
Adapted some import statements to eric 23.1 and newer.
--- a/ChangeLog Mon Oct 24 18:01:59 2022 +0200 +++ b/ChangeLog Tue Dec 20 16:32:09 2022 +0100 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 10.4.0 +- adapted some import statements to eric 23.1 and newer + Version 10.3.0 - adapted the import statements to the new structure
--- a/MqttMonitor/ConfigurationPage/MqttPage.py Mon Oct 24 18:01:59 2022 +0200 +++ b/MqttMonitor/ConfigurationPage/MqttPage.py Tue Dec 20 16:32:09 2022 +0100 @@ -11,10 +11,9 @@ ConfigurationPageBase, ) +from ..MqttProtocols import MqttProtocols from .Ui_MqttPage import Ui_MqttPage -from ..MqttProtocols import MqttProtocols - class MqttPage(ConfigurationPageBase, Ui_MqttPage): """
--- a/MqttMonitor/MqttClient.py Mon Oct 24 18:01:59 2022 +0200 +++ b/MqttMonitor/MqttClient.py Tue Dec 20 16:32:09 2022 +0100 @@ -7,11 +7,11 @@ Module implementing a PyQt wrapper around the paho MQTT client. """ -from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QCoreApplication, QTimer +import paho.mqtt.client as mqtt -import paho.mqtt.client as mqtt from paho.mqtt.packettypes import PacketTypes from paho.mqtt.properties import Properties +from PyQt6.QtCore import QCoreApplication, QObject, QTimer, pyqtSignal, pyqtSlot from eric7.Utilities.crypto import pwConvert
--- a/MqttMonitor/MqttConnectionOptionsDialog.py Mon Oct 24 18:01:59 2022 +0200 +++ b/MqttMonitor/MqttConnectionOptionsDialog.py Tue Dec 20 16:32:09 2022 +0100 @@ -9,21 +9,21 @@ import copy -from PyQt6.QtCore import pyqtSlot, QUuid -from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton +from PyQt6.QtCore import QUuid, pyqtSlot +from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox try: from eric7.EricGui import EricPixmapCache except ImportError: from UI import PixmapCache as EricPixmapCache + from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricPathPicker import EricPathPickerModes from eric7.Utilities.crypto import pwConvert -from .Ui_MqttConnectionOptionsDialog import Ui_MqttConnectionOptionsDialog - from .MqttClient import MqttClient from .MqttProtocols import MqttProtocols +from .Ui_MqttConnectionOptionsDialog import Ui_MqttConnectionOptionsDialog class MqttConnectionOptionsDialog(QDialog, Ui_MqttConnectionOptionsDialog):
--- a/MqttMonitor/MqttConnectionProfilesDialog.py Mon Oct 24 18:01:59 2022 +0200 +++ b/MqttMonitor/MqttConnectionProfilesDialog.py Tue Dec 20 16:32:09 2022 +0100 @@ -10,28 +10,28 @@ import collections import copy -from PyQt6.QtCore import pyqtSlot, Qt, QUuid +from PyQt6.QtCore import Qt, QUuid, pyqtSlot from PyQt6.QtWidgets import ( + QAbstractButton, QDialog, QDialogButtonBox, - QAbstractButton, - QListWidgetItem, QInputDialog, QLineEdit, + QListWidgetItem, ) try: from eric7.EricGui import EricPixmapCache except ImportError: from UI import PixmapCache as EricPixmapCache + from eric7.EricWidgets import EricMessageBox from eric7.EricWidgets.EricPathPicker import EricPathPickerModes from eric7.Utilities.crypto import pwConvert -from .Ui_MqttConnectionProfilesDialog import Ui_MqttConnectionProfilesDialog - from .MqttClient import MqttClient from .MqttProtocols import MqttProtocols +from .Ui_MqttConnectionProfilesDialog import Ui_MqttConnectionProfilesDialog class MqttConnectionProfilesDialog(QDialog, Ui_MqttConnectionProfilesDialog):
--- a/MqttMonitor/MqttMonitorWidget.py Mon Oct 24 18:01:59 2022 +0200 +++ b/MqttMonitor/MqttMonitorWidget.py Tue Dec 20 16:32:09 2022 +0100 @@ -12,9 +12,9 @@ import copy import os -from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QFileInfo, QPoint -from PyQt6.QtGui import QFont, QTextCursor, QBrush, QColor -from PyQt6.QtWidgets import QWidget, QDialog, QMenu +from PyQt6.QtCore import QFileInfo, QPoint, Qt, QTimer, pyqtSlot +from PyQt6.QtGui import QBrush, QColor, QFont, QTextCursor +from PyQt6.QtWidgets import QDialog, QMenu, QWidget from eric7 import Utilities @@ -22,11 +22,16 @@ from eric7.EricGui import EricPixmapCache except ImportError: from UI import PixmapCache as EricPixmapCache -from eric7.EricWidgets import EricMessageBox, EricFileDialog + +from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricPathPicker import EricPathPickerModes -from .Ui_MqttMonitorWidget import Ui_MqttMonitorWidget +try: + from eric7.SystemUtilities.FileSystemUtilities import toNativeSeparators +except ImportError: + # imports for eric < 23.1 + from eric7.Utilities import toNativeSeparators from .MqttClient import ( MqttClient, @@ -34,8 +39,9 @@ mqttErrorMessage, mqttLogLevelString, ) +from .MqttProtocols import MqttProtocols from .MqttReasonCodes import mqttReasonCode -from .MqttProtocols import MqttProtocols +from .Ui_MqttMonitorWidget import Ui_MqttMonitorWidget class MqttMonitorWidget(QWidget, Ui_MqttMonitorWidget): @@ -961,7 +967,7 @@ if not res: return - fn = Utilities.toNativeSeparators(fn) + fn = toNativeSeparators(fn) try: with open(fn, "w") as f: f.write(self.messagesEdit.toPlainText()) @@ -1022,7 +1028,7 @@ if not res: return - fn = Utilities.toNativeSeparators(fn) + fn = toNativeSeparators(fn) try: with open(fn, "w") as f: f.write(self.logEdit.toPlainText())
--- a/MqttMonitor/MqttReasonCodes.py Mon Oct 24 18:01:59 2022 +0200 +++ b/MqttMonitor/MqttReasonCodes.py Tue Dec 20 16:32:09 2022 +0100 @@ -7,10 +7,9 @@ Module implementing the translated MQTT v5 reason codes. """ +from paho.mqtt.packettypes import PacketTypes from PyQt6.QtCore import QCoreApplication -from paho.mqtt.packettypes import PacketTypes - MqttReasonCodeNames = { 0: { QCoreApplication.translate("MqttReasonCodeNames", "Success"): [
--- a/MqttMonitor/MqttUserPropertiesEditor.py Mon Oct 24 18:01:59 2022 +0200 +++ b/MqttMonitor/MqttUserPropertiesEditor.py Tue Dec 20 16:32:09 2022 +0100 @@ -7,13 +7,13 @@ Module implementing an editor for MQTT v5 user properties. """ -from PyQt6.QtCore import pyqtSlot, Qt +from PyQt6.QtCore import Qt, pyqtSlot from PyQt6.QtWidgets import ( QDialog, QDialogButtonBox, + QLabel, QTableWidgetItem, QVBoxLayout, - QLabel, QWidget, )
--- a/PluginMqttMonitor.epj Mon Oct 24 18:01:59 2022 +0200 +++ b/PluginMqttMonitor.epj Tue Dec 20 16:32:09 2022 +0100 @@ -203,7 +203,8 @@ "MqttMonitor/icons/quickopen-light.svg", "PKGLIST", "PluginMqttMonitor.epj", - "PluginMqttMonitor.zip" + "PluginMqttMonitor.zip", + "pyproject.toml" ], "OTHERTOOLSPARMS": { "Black": { @@ -221,6 +222,23 @@ "py38", "py37" ] + }, + "isort": { + "combine_as_imports": true, + "config_source": "project", + "extend_skip_glob": [ + "*/Ui_*.py" + ], + "lines_between_types": 1, + "profile": "black", + "sort_order": "natural", + "supported_extensions": [ + "py", + "pyi", + "pyx", + "pxd", + "pyw" + ] } }, "PACKAGERSPARMS": {},
--- a/PluginMqttMonitor.py Mon Oct 24 18:01:59 2022 +0200 +++ b/PluginMqttMonitor.py Tue Dec 20 16:32:09 2022 +0100 @@ -7,10 +7,10 @@ Module implementing the MQTT Monitor plug-in. """ +import json import os -import json -from PyQt6.QtCore import Qt, QObject, QTranslator, QCoreApplication +from PyQt6.QtCore import QCoreApplication, QObject, Qt, QTranslator from PyQt6.QtGui import QKeySequence from eric7 import Preferences @@ -29,7 +29,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "10.3.0" +version = "10.4.0" className = "MqttMonitorPlugin" packageName = "MqttMonitor" shortDescription = "Plug-in implementing a tool to connect to a MQTT broker"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pyproject.toml Tue Dec 20 16:32:09 2022 +0100 @@ -0,0 +1,10 @@ +[tool.isort] +profile = "black" +sort_order = "natural" +supported_extensions = ["py", "pyi", "pyx", "pxd", "pyw"] +lines_between_types = 1 +extend_skip_glob = [ + "*/Ui_*.py", +] +combine_as_imports = true +known_first_party = ["MqttMonitor", "eric7"]
