From 2a43c33875867ab35e720d5090ccf69c6c26b864 Mon Sep 17 00:00:00 2001 From: genjix Date: Wed, 21 Mar 2012 10:48:49 +0000 Subject: [PATCH] Removed redundant while loop - hooray for flatter code. --- stratum.py | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/stratum.py b/stratum.py index dcc32b2..fab33f9 100644 --- a/stratum.py +++ b/stratum.py @@ -131,36 +131,35 @@ class TcpClientRequestor(threading.Thread): return None def parse(self): - while True: - raw_buffer = self.message.find('\n') - if raw_buffer == -1: - return True + raw_buffer = self.message.find('\n') + if raw_buffer == -1: + return True - raw_command = self.message[0:raw_buffer].strip() - self.message = self.message[raw_buffer + 1:] - if raw_command == 'quit': - return False + raw_command = self.message[0:raw_buffer].strip() + self.message = self.message[raw_buffer + 1:] + if raw_command == 'quit': + return False - try: - command = json.loads(raw_command) - except: - self.session.push_response( - {"error": "bad JSON", "request": raw_command}) - return True + try: + command = json.loads(raw_command) + except: + self.session.push_response( + {"error": "bad JSON", "request": raw_command}) + return True - try: - # Try to load vital fields, and return an error if - # unsuccessful. - message_id = command['id'] - method = command['method'] - except KeyError: - # Return an error JSON in response. - self.session.push_response( - {"error": "syntax error", "request": raw_command}) - else: - self.session.push_request(command) + try: + # Try to load vital fields, and return an error if + # unsuccessful. + message_id = command['id'] + method = command['method'] + except KeyError: + # Return an error JSON in response. + self.session.push_response( + {"error": "syntax error", "request": raw_command}) + else: + self.session.push_request(command) - return True + return True class TcpServer(threading.Thread): -- 1.7.1