Fixed a backward compatibility issue with eric-ide < 24.11. eric7 release-11.0.2

Sat, 19 Oct 2024 16:04:24 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 19 Oct 2024 16:04:24 +0200
branch
eric7
changeset 151
f9830d91be9a
parent 150
c087495610b4
child 152
0a4969f23c46

Fixed a backward compatibility issue with eric-ide < 24.11.

.hgtags file | annotate | diff | comparison | revisions
ChangeLog file | annotate | diff | comparison | revisions
MqttMonitor/MqttClient.py file | annotate | diff | comparison | revisions
MqttMonitor/MqttConnectionOptionsDialog.py file | annotate | diff | comparison | revisions
MqttMonitor/MqttConnectionProfilesDialog.py file | annotate | diff | comparison | revisions
PluginMqttMonitor.py file | annotate | diff | comparison | revisions
PluginMqttMonitor.zip file | annotate | diff | comparison | revisions
--- a/.hgtags	Sat Oct 19 15:56:29 2024 +0200
+++ b/.hgtags	Sat Oct 19 16:04:24 2024 +0200
@@ -24,9 +24,4 @@
 fd301f9007527a1c6e68d8fccfbef5689943e696 release-10.4.2
 864edfb1bb639293418dbd08ad60054ea1932461 release-10.5.0
 51bc5bcc672ab6c30bd8810d45307720e7f900ce release-11.0.0
-3f8e91170c3778298b9b0bf7fc58555a6d49d23f release-11.0.1
-3f8e91170c3778298b9b0bf7fc58555a6d49d23f release-11.0.1
-37794b4f407d923216c89f68634dac205d7870db release-11.0.1
-37794b4f407d923216c89f68634dac205d7870db release-11.0.1
 187406bcc8ae71b8339ee50b1e8d3c1e72eb4e75 release-11.0.1
-97a796fbdb1740567693339266d0f0947e2f0e0c release-11.0.2
--- a/ChangeLog	Sat Oct 19 15:56:29 2024 +0200
+++ b/ChangeLog	Sat Oct 19 16:04:24 2024 +0200
@@ -1,6 +1,9 @@
 ChangeLog
 ---------
 
+Version 11.0.2:
+- Fixed a backward compatibility issue with eric-ide < 24.11
+
 Version 11.0.1:
 - Fixed an issue causing an exception on computers with a small screen or when
   the `Combined Sidebars` option is selected.
--- a/MqttMonitor/MqttClient.py	Sat Oct 19 15:56:29 2024 +0200
+++ b/MqttMonitor/MqttClient.py	Sat Oct 19 16:04:24 2024 +0200
@@ -13,7 +13,11 @@
 from paho.mqtt.properties import Properties
 from PyQt6.QtCore import QCoreApplication, QObject, QTimer, pyqtSignal, pyqtSlot
 
-from eric7.Utilities.crypto import pwConvert
+try:
+    from eric7.EricUtilities.crypto import pwConvert
+except ImportError:
+    # backward compatibility for eric-ide < 24.11
+    from eric7.Utilities.crypto import pwConvert
 
 from .MqttProtocols import MqttProtocols
 
--- a/MqttMonitor/MqttConnectionOptionsDialog.py	Sat Oct 19 15:56:29 2024 +0200
+++ b/MqttMonitor/MqttConnectionOptionsDialog.py	Sat Oct 19 16:04:24 2024 +0200
@@ -19,7 +19,12 @@
 
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.Utilities.crypto import pwConvert
+
+try:
+    from eric7.EricUtilities.crypto import pwConvert
+except ImportError:
+    # backward compatibility for eric-ide < 24.11
+    from eric7.Utilities.crypto import pwConvert
 
 from .MqttClient import MqttClient
 from .MqttProtocols import MqttProtocols
--- a/MqttMonitor/MqttConnectionProfilesDialog.py	Sat Oct 19 15:56:29 2024 +0200
+++ b/MqttMonitor/MqttConnectionProfilesDialog.py	Sat Oct 19 16:04:24 2024 +0200
@@ -27,7 +27,12 @@
 
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.Utilities.crypto import pwConvert
+
+try:
+    from eric7.EricUtilities.crypto import pwConvert
+except ImportError:
+    # backward compatibility for eric-ide < 24.11
+    from eric7.Utilities.crypto import pwConvert
 
 from .MqttClient import MqttClient
 from .MqttProtocols import MqttProtocols
--- a/PluginMqttMonitor.py	Sat Oct 19 15:56:29 2024 +0200
+++ b/PluginMqttMonitor.py	Sat Oct 19 16:04:24 2024 +0200
@@ -40,7 +40,7 @@
     "author": "Detlev Offenbach <detlev@die-offenbachs.de>",
     "autoactivate": True,
     "deactivateable": True,
-    "version": "11.0.1",
+    "version": "11.0.2",
     "className": "MqttMonitorPlugin",
     "packageName": "MqttMonitor",
     "shortDescription": "Plug-in implementing a tool to connect to a MQTT broker",
Binary file PluginMqttMonitor.zip has changed

eric ide

mercurial