From 97a75489bfc0e1016bee706425521144d919db91 Mon Sep 17 00:00:00 2001
From: Christopher Coffey <nomad@cybermerc.org>
Date: Wed, 2 Mar 2016 20:05:23 -0600
Subject: [PATCH] pep8 and python3 compat

---
 jsonsocket.py | 254 +++++++++++++++++++++++++-------------------------
 1 file changed, 128 insertions(+), 126 deletions(-)

diff --git a/jsonsocket.py b/jsonsocket.py
index 9dfe7a6..4dab118 100644
--- a/jsonsocket.py
+++ b/jsonsocket.py
@@ -1,134 +1,136 @@
-import json, socket
+#!/usr/bin/env python
+
+import json
+import socket
+
 
 class Server(object):
-  """
-  A JSON socket server used to communicate with a JSON socket client. All the
-  data is serialized in JSON. How to use it:
-
-  server = Server(host, port)
-  while True:
-    server.accept()
-    data = server.recv()
-    # shortcut: data = server.accept().recv()
-    server.send({'status': 'ok'})
-  """
-
-  backlog = 5
-  client = None
-
-  def __init__(self, host, port):
-    self.socket = socket.socket()
-    self.socket.bind((host, port))
-    self.socket.listen(self.backlog)
-
-  def __del__(self):
-    self.close()
-
-  def accept(self):
-    # if a client is already connected, disconnect it
-    if self.client:
-      self.client.close()
-    self.client, self.client_addr = self.socket.accept()
-    return self
-
-  def send(self, data):
-    if not self.client:
-      raise Exception('Cannot send data, no client is connected')
-    _send(self.client, data)
-    return self
-
-  def recv(self):
-    if not self.client:
-      raise Exception('Cannot receive data, no client is connected')
-    return _recv(self.client)
-
-  def close(self):
-    if self.client:
-      self.client.close()
-      self.client = None
-    if self.socket:
-      self.socket.close()
-      self.socket = None
+    """
+    A JSON socket server used to communicate with a JSON socket client. All the
+    data is serialized in JSON. How to use it:
+    server = Server(host, port)
+    while True:
+        server.accept()
+        data = server.recv()
+        # shortcut: data = server.accept().recv()
+        server.send({'status': 'ok'})
+    """
+
+    backlog = 5
+    client = None
+
+    def __init__(self, host, port):
+        self.socket = socket.socket()
+        self.socket.bind((host, port))
+        self.socket.listen(self.backlog)
+
+    def __del__(self):
+        self.close()
+
+    def accept(self):
+        # if a client is already connected, disconnect it
+        if self.client:
+            self.client.close()
+        self.client, self.client_addr = self.socket.accept()
+        return self
+
+    def send(self, data):
+        if not self.client:
+            raise Exception('Cannot send data, no client is connected')
+        _send(self.client, data)
+        return self
+
+    def recv(self):
+        if not self.client:
+            raise Exception('Cannot receive data, no client is connected')
+        return _recv(self.client)
+
+    def close(self):
+        if self.client:
+            self.client.close()
+            self.client = None
+        if self.socket:
+            self.socket.close()
+            self.socket = None
 
 
 class Client(object):
-  """
-  A JSON socket client used to communicate with a JSON socket server. All the
-  data is serialized in JSON. How to use it:
-
-  data = {
-    'name': 'Patrick Jane',
-    'age': 45,
-    'children': ['Susie', 'Mike', 'Philip']
-  }
-  client = Client()
-  client.connect(host, port)
-  client.send(data)
-  response = client.recv()
-  # or in one line:
-  response = Client().connect(host, port).send(data).recv()
-  """
-
-  socket = None
-
-  def __del__(self):
-    self.close()
-
-  def connect(self, host, port):
-    self.socket = socket.socket()
-    self.socket.connect((host, port))
-    return self
-
-  def send(self, data):
-    if not self.socket:
-      raise Exception('You have to connect first before sending data')
-    _send(self.socket, data)
-    return self
-
-  def recv(self):
-    if not self.socket:
-      raise Exception('You have to connect first before receiving data')
-    return _recv(self.socket)
-
-  def recv_and_close(self):
-    data = self.recv()
-    self.close()
-    return data
-
-  def close(self):
-    if self.socket:
-      self.socket.close()
-      self.socket = None
-
-
-## helper functions ##
-
+    """
+    A JSON socket client used to communicate with a JSON socket server. All the
+    data is serialized in JSON. How to use it:
+    data = {
+        'name': 'Patrick Jane',
+        'age': 45,
+        'children': ['Susie', 'Mike', 'Philip']
+    }
+    client = Client()
+    client.connect(host, port)
+    client.send(data)
+    response = client.recv()
+    # or in one line:
+    response = Client().connect(host, port).send(data).recv()
+    """
+
+    socket = None
+
+    def __del__(self):
+        self.close()
+
+    def connect(self, host, port):
+        self.socket = socket.socket()
+        self.socket.connect((host, port))
+        return self
+
+    def send(self, data):
+        if not self.socket:
+            raise Exception('You have to connect first before sending data')
+        _send(self.socket, data)
+        return self
+
+    def recv(self):
+        if not self.socket:
+            raise Exception('You have to connect first before receiving data')
+        return _recv(self.socket)
+
+    def recv_and_close(self):
+        data = self.recv()
+        self.close()
+        return data
+
+    def close(self):
+        if self.socket:
+            self.socket.close()
+            self.socket = None
+
+
+# helper functions
 def _send(socket, data):
-  try:
-    serialized = json.dumps(data)
-  except (TypeError, ValueError), e:
-    raise Exception('You can only send JSON-serializable data')
-  # send the length of the serialized data first
-  socket.send('%d\n' % len(serialized))
-  # send the serialized data
-  socket.sendall(serialized)
+    try:
+        serialized = json.dumps(data)
+    except (TypeError, ValueError) as e:
+        raise Exception('You can only send JSON-serializable data')
+    # send the length of the serialized data first
+    socket.send('{}\n'.format(len(serialized)).encode('utf-8'))
+    # send the serialized data
+    socket.sendall(serialized.encode('utf-8'))
+
 
 def _recv(socket):
-  # read the length of the data, letter by letter until we reach EOL
-  length_str = ''
-  char = socket.recv(1)
-  while char != '\n':
-    length_str += char
-    char = socket.recv(1)
-  total = int(length_str)
-  # use a memoryview to receive the data chunk by chunk efficiently
-  view = memoryview(bytearray(total))
-  next_offset = 0
-  while total - next_offset > 0:
-    recv_size = socket.recv_into(view[next_offset:], total - next_offset)
-    next_offset += recv_size
-  try:
-    deserialized = json.loads(view.tobytes())
-  except (TypeError, ValueError), e:
-    raise Exception('Data received was not in JSON format')
-  return deserialized
+    # read the length of the data, letter by letter until we reach EOL
+    length_str = ''
+    char = socket.recv(1).decode('utf-8')
+    while char != '\n':
+        length_str += char
+        char = socket.recv(1).decode('utf-8')
+    total = int(length_str)
+    # use a memoryview to receive the data chunk by chunk efficiently
+    view = memoryview(bytearray(total))
+    next_offset = 0
+    while total - next_offset > 0:
+        recv_size = socket.recv_into(view[next_offset:], total - next_offset)
+        next_offset += recv_size
+    try:
+        deserialized = json.loads(view.tobytes().decode())
+    except (TypeError, ValueError) as e:
+        raise Exception('Data received was not in JSON format')
+    return deserialized