From af4940432073618a614a8e575750445b19a60d94 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sat, 16 Mar 2019 02:32:10 +0100 Subject: [PATCH] Remove support of old request type --- src/Connection/Connection.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Connection/Connection.py b/src/Connection/Connection.py index 2b3f61d2..0c532e82 100644 --- a/src/Connection/Connection.py +++ b/src/Connection/Connection.py @@ -436,10 +436,7 @@ class Connection(object): # Handle incoming message def handleMessage(self, message): - try: - cmd = message["cmd"] - except TypeError, AttributeError: - cmd = None + cmd = message["cmd"] self.last_message_time = time.time() self.last_cmd_recv = cmd @@ -477,12 +474,6 @@ class Connection(object): self.handleHandshake(message) else: self.server.handleRequest(self, message) - else: # Old style response, no req_id defined - self.log("Unknown message, waiting: %s" % self.waiting_requests.keys()) - if self.waiting_requests: - last_req_id = min(self.waiting_requests.keys()) # Get the oldest waiting request and set it true - self.waiting_requests[last_req_id]["evt"].set(message) - del self.waiting_requests[last_req_id] # Remove from waiting request # Incoming handshake set request def handleHandshake(self, message):