Mercurial Repositories > MQTT Monitor / file diff

--- a/MqttMonitor/MqttClient.py	Thu May 28 17:36:58 2020 +0200
+++ b/MqttMonitor/MqttClient.py	Tue Jun 23 19:26:33 2020 +0200
@@ -7,14 +7,9 @@
 Module implementing a PyQt wrapper around the paho MQTT client.
 """
 
-from __future__ import unicode_literals
-try:
-    str = unicode       # __IGNORE_EXCEPTION__
-except NameError:
-    pass
-
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QCoreApplication, \
-    QTimer
+from PyQt5.QtCore import (
+    pyqtSignal, pyqtSlot, QObject, QCoreApplication, QTimer
+)
 
 import paho.mqtt.client as mqtt
 
@@ -106,23 +101,23 @@
         """
         Private method to initialize the MQTT callback methods.
         """
-        self.__mqttClient.on_connect = \
+        self.__mqttClient.on_connect = (
             lambda client, userdata, flags, rc: self.onConnect.emit(
-                flags, rc)
-        self.__mqttClient.on_disconnect = \
-            lambda client, userdata, rc: self.onDisconnected.emit(rc)
-        self.__mqttClient.on_log = \
-            lambda client, userdata, level, buf: self.onLog.emit(level, buf)
-        self.__mqttClient.on_message = \
+                flags, rc))
+        self.__mqttClient.on_disconnect = (
+            lambda client, userdata, rc: self.onDisconnected.emit(rc))
+        self.__mqttClient.on_log = (
+            lambda client, userdata, level, buf: self.onLog.emit(level, buf))
+        self.__mqttClient.on_message = (
             lambda client, userdata, message: self.onMessage.emit(
-                message.topic, message.payload, message.qos, message.retain)
-        self.__mqttClient.on_publish = \
-            lambda client, userdata, mid: self.onPublish.emit(mid)
-        self.__mqttClient.on_subscribe = \
+                message.topic, message.payload, message.qos, message.retain))
+        self.__mqttClient.on_publish = (
+            lambda client, userdata, mid: self.onPublish.emit(mid))
+        self.__mqttClient.on_subscribe = (
             lambda client, userdata, mid, grantedQos: self.onSubscribe.emit(
-                mid, grantedQos)
-        self.__mqttClient.on_unsubscribe = \
-            lambda client, userdata, mid: self.onUnsubscribe.emit(mid)
+                mid, grantedQos))
+        self.__mqttClient.on_unsubscribe = (
+            lambda client, userdata, mid: self.onUnsubscribe.emit(mid))
     
     @pyqtSlot()
     def __connectTimeout(self):
@@ -342,8 +337,10 @@
             
             # step 4: set TLS parameters
             if parametersDict["TlsEnable"]:
-                if parametersDict["TlsCaCert"] and \
-                        parametersDict["TlsClientCert"]:
+                if (
+                    parametersDict["TlsCaCert"] and
+                    parametersDict["TlsClientCert"]
+                ):
                     # use self signed client certificate
                     self.setTLS(caCerts=parametersDict["TlsCaCert"],
                                 certFile=parametersDict["TlsClientCert"],