diff options
| -rw-r--r-- | klippy/webhooks.py | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/klippy/webhooks.py b/klippy/webhooks.py index de89a283..6f6f8820 100644 --- a/klippy/webhooks.py +++ b/klippy/webhooks.py @@ -14,15 +14,17 @@ REQUEST_LOG_SIZE = 20 # # https://stackoverflow.com/questions/956867/ # -def byteify(data, ignore_dicts=False): - if isinstance(data, unicode): - return data.encode('utf-8') - if isinstance(data, list): - return [byteify(i, True) for i in data] - if isinstance(data, dict) and not ignore_dicts: - return {byteify(k, True): byteify(v, True) - for k, v in data.items()} - return data +json_loads_byteify = None +if sys.version_info.major < 3: + def json_loads_byteify(data, ignore_dicts=False): + if isinstance(data, unicode): + return data.encode('utf-8') + if isinstance(data, list): + return [json_loads_byteify(i, True) for i in data] + if isinstance(data, dict) and not ignore_dicts: + return {json_loads_byteify(k, True): json_loads_byteify(v, True) + for k, v in data.items()} + return data class WebRequestError(gcode.CommandError): def __init__(self, message,): @@ -40,7 +42,7 @@ class WebRequest: error = WebRequestError def __init__(self, client_conn, request): self.client_conn = client_conn - base_request = json.loads(request, object_hook=byteify) + base_request = json.loads(request, object_hook=json_loads_byteify) if type(base_request) != dict: raise ValueError("Not a top-level dictionary") self.id = base_request.get('id', None) @@ -170,7 +172,7 @@ class ClientConnection: self.sock = sock self.fd_handle = self.reactor.register_fd( self.sock.fileno(), self.process_received) - self.partial_data = self.send_buffer = "" + self.partial_data = self.send_buffer = b"" self.is_sending_data = False self.set_client_info("?", "New connection") self.request_log = collections.deque([], REQUEST_LOG_SIZE) @@ -216,14 +218,14 @@ class ClientConnection: # If bad file descriptor allow connection to be # closed by the data check if e.errno == errno.EBADF: - data = '' + data = b"" else: return - if data == '': + if not data: # Socket Closed self.close() return - requests = data.split('\x03') + requests = data.split(b'\x03') requests[0] = self.partial_data + requests[0] self.partial_data = requests.pop() for req in requests: @@ -255,7 +257,8 @@ class ClientConnection: self.send(result) def send(self, data): - self.send_buffer += json.dumps(data, separators=(',', ':')) + "\x03" + jmsg = json.dumps(data, separators=(',', ':')) + self.send_buffer += jmsg.encode() + b"\x03" if not self.is_sending_data: self.is_sending_data = True self.reactor.register_callback(self._do_send) |