Fixed E711 and E722 errors

Author: Amele9

examples/echo.py

@@ -1,14 +1,14 @@
-from datetime import datetime
 import json
+from datetime import datetime
 
 import whatsapp_api_webhook_server_python.webhooksHandler as handler
 
 
 def onEvent(webhookHandler: handler.WebhooksHandler, typeWebhook: str, body):
     if typeWebhook == 'incomingMessageReceived':
-        onIncomingMessageReceived(webhookHandler, body)      
-    elif typeWebhook == 'deviceInfo':   
-        onDeviceInfo(webhookHandler, body)              
+        onIncomingMessageReceived(webhookHandler, body)
+    elif typeWebhook == 'deviceInfo':
+        onDeviceInfo(webhookHandler, body)
     elif typeWebhook == 'incomingCall':
         onIncomingCall(webhookHandler, body)
     elif typeWebhook == 'incomingMessageReceived':
@@ -24,60 +24,68 @@ def onEvent(webhookHandler: handler.WebhooksHandler, typeWebhook: str, body):
     elif typeWebhook == 'statusInstanceChanged':
         onStatusInstanceChanged(webhookHandler, body)
 
-def onIncomingMessageReceived(webhookHandler: handler.WebhooksHandler, body: object):
+
+def onIncomingMessageReceived(webhookHandler: handler.WebhooksHandler,
+                              body: object):
     idMessage = body['idMessage']
     eventDate = datetime.fromtimestamp(body['timestamp'])
     senderData = body['senderData']
     messageData = body['messageData']
     TextOut = idMessage + ': ' \
-        + 'At ' + str(eventDate) + ' Incoming from ' \
-        + json.dumps(senderData, ensure_ascii=False) \
-        + ' message = ' + json.dumps(messageData, ensure_ascii=False)
+              + 'At ' + str(eventDate) + ' Incoming from ' \
+              + json.dumps(senderData, ensure_ascii=False) \
+              + ' message = ' + json.dumps(messageData, ensure_ascii=False)
     webhookHandler.set_status(200)
     print(TextOut)
 
+
 def onIncomingCall(webhookHandler: handler.WebhooksHandler, body):
     idMessage = body['idMessage']
     eventDate = datetime.fromtimestamp(body['timestamp'])
     fromWho = body['from']
     TextOut = idMessage + ': ' \
-        + 'Call from ' + fromWho \
-        + ' at ' + str(eventDate)
+              + 'Call from ' + fromWho \
+              + ' at ' + str(eventDate)
     webhookHandler.set_status(200)
     print(TextOut)
 
+
 def onDeviceInfo(webhookHandler: handler.WebhooksHandler, body):
     eventDate = datetime.fromtimestamp(body['timestamp'])
     deviceData = body['deviceData']
     TextOut = 'At ' + str(eventDate) + ': ' \
-        + json.dumps(deviceData, ensure_ascii=False)
+              + json.dumps(deviceData, ensure_ascii=False)
     webhookHandler.set_status(200)
     print(TextOut)
 
+
 def onOutgoingMessageReceived(webhookHandler: handler.WebhooksHandler, body):
     idMessage = body['idMessage']
     eventDate = datetime.fromtimestamp(body['timestamp'])
     senderData = body['senderData']
     messageData = body['messageData']
     TextOut = idMessage + ': ' \
-        + 'At ' + str(eventDate) + ' Outgoing from ' \
-        + json.dumps(senderData, ensure_ascii=False) \
-        + ' message = ' + json.dumps(messageData, ensure_ascii=False)
+              + 'At ' + str(eventDate) + ' Outgoing from ' \
+              + json.dumps(senderData, ensure_ascii=False) \
+              + ' message = ' + json.dumps(messageData, ensure_ascii=False)
     webhookHandler.set_status(200)
     print(TextOut)
 
-def onOutgoingAPIMessageReceived(webhookHandler: handler.WebhooksHandler, body):
+
+def onOutgoingAPIMessageReceived(webhookHandler: handler.WebhooksHandler,
+                                 body):
     idMessage = body['idMessage']
     eventDate = datetime.fromtimestamp(body['timestamp'])
     senderData = body['senderData']
     messageData = body['messageData']
     TextOut = idMessage + ': ' \
-        + 'At ' + str(eventDate) + ' API outgoing from ' \
-        + json.dumps(senderData, ensure_ascii=False) + \
-        ' message = ' + json.dumps(messageData, ensure_ascii=False)
+              + 'At ' + str(eventDate) + ' API outgoing from ' \
+              + json.dumps(senderData, ensure_ascii=False) + \
+              ' message = ' + json.dumps(messageData, ensure_ascii=False)
     webhookHandler.set_status(200)
     print(TextOut)
 
+
 def onOutgoingMessageStatus(webhookHandler: handler.WebhooksHandler, body):
     idMessage = body['idMessage']
     status = body['status']
@@ -86,24 +94,28 @@ def onOutgoingMessageStatus(webhookHandler: handler.WebhooksHandler, body):
     webhookHandler.set_status(200)
     print(TextOut)
 
+
 def onStateInstanceChanged(webhookHandler: handler.WebhooksHandler, body):
     eventDate = datetime.fromtimestamp(body['timestamp'])
     stateInstance = body['stateInstance']
     TextOut = 'At ' + str(eventDate) + ' state instance = ' \
-        + json.dumps(stateInstance, ensure_ascii=False)
+              + json.dumps(stateInstance, ensure_ascii=False)
     webhookHandler.set_status(200)
     print(TextOut)
 
+
 def onStatusInstanceChanged(webhookHandler: handler.WebhooksHandler, body):
     eventDate = datetime.fromtimestamp(body['timestamp'])
     statusInstance = body['statusInstance']
     TextOut = 'At ' + str(eventDate) + ' status instance = ' \
-        + json.dumps(statusInstance, ensure_ascii=False)
+              + json.dumps(statusInstance, ensure_ascii=False)
     webhookHandler.set_status(200)
     print(TextOut)
 
+
 def main():
     handler.startServer(None, 80, onEvent)
 
+
 if __name__ == "__main__":
-    main()
+    main()

whatsapp_api_webhook_server_python/webhooks.py

@@ -6,7 +6,9 @@ class Webhooks():
     def webhookProccessing(dataText, onEvent):
         try:
             data = json.loads(dataText)
-        except:
-           return 
+        except Exception as error:
+            print(error)
+
+            return
         typeWebhook = data['typeWebhook']
-        onEvent(typeWebhook, data)
+        onEvent(typeWebhook, data)

whatsapp_api_webhook_server_python/webhooksHandler.py

@@ -8,7 +8,7 @@ class WebhooksHandler(tornado.web.RequestHandler):
 
     def get(self):
         length = self.request.headers.get('Content-Length')
-        if length != None:
+        if length is not None:
             dataBytes = self.request.body
             dataText = dataBytes.decode("utf-8", 'ignore')
             Webhooks.webhookProccessing(dataText, self.onEvent)
@@ -18,29 +18,31 @@ def get(self):
 
     def post(self):
         length = self.request.headers.get('Content-Length')
-        if length != None:
+        if length is not None:
             dataBytes = self.request.body
             dataText = dataBytes.decode("utf-8", 'ignore')
             Webhooks.webhookProccessing(dataText, self.onEvent)
 
     def delete(self):
         length = self.request.headers.get('Content-Length')
-        if length != None:
+        if length is not None:
             dataBytes = self.request.body
             dataText = dataBytes.decode("utf-8", 'ignore')
             Webhooks.webhookProccessing(dataText, self.onEvent)
-  
+
+
 class Application(tornado.web.Application):
     def __init__(self, handler):
         handlers = [
             (r"/", handler),
         ]
         tornado.web.Application.__init__(self, handlers)
 
+
 def startServer(host: str, port: int, onEvent, startLoop: bool = True):
     handler = WebhooksHandler
     handler.onEvent = onEvent
     http_server = tornado.httpserver.HTTPServer(Application(handler))
     http_server.listen(port=port, address=host)
     if startLoop:
-        tornado.ioloop.IOLoop.instance().start()
+        tornado.ioloop.IOLoop.instance().start()