Mercurial Repositories > MQTT Monitor / file diff

--- 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())