pep8 style fixes

example/python/app.py

@@ -1,14 +1,12 @@
-
 import sys
-sys.path.insert(0, './tmsp')
 
-from wire import *
-from server import *
+from wire import hex2bytes, decode_big_endian, encode_big_endian
+from server import TMSPServer
+from reader import BytesBuffer
 
 
-# tmsp application interface
-
 class CounterApplication():
+
     def __init__(self):
         self.hashCount = 0
         self.txCount = 0
@@ -17,7 +15,9 @@ class CounterApplication():
     def open(self):
         return CounterAppContext(self)
 
+
 class CounterAppContext():
+
     def __init__(self, app):
         self.app = app
         self.hashCount = app.hashCount
@@ -29,7 +29,9 @@ class CounterAppContext():
         return msg, 0
 
     def info(self):
-		return ["hash, tx, commit counts:%d, %d, %d"%(self.hashCount, self.txCount, self.commitCount)], 0
+        return ["hash, tx, commit counts:%d, %d, %d" % (self.hashCount,
+                                                        self.txCount,
+                                                        self.commitCount)], 0
 
     def set_option(self, key, value):
         if key == "serial" and value == "on":
@@ -41,7 +43,8 @@ class CounterAppContext():
             txByteArray = bytearray(txBytes)
             if len(txBytes) >= 2 and txBytes[:2] == "0x":
                 txByteArray = hex2bytes(txBytes[2:])
-			txValue = decode_big_endian(BytesBuffer(txByteArray), len(txBytes))
+            txValue = decode_big_endian(
+                BytesBuffer(txByteArray), len(txBytes))
             if txValue != self.txCount:
                 return None, 1
         self.txCount += 1

example/python/tmsp/msg.py

@@ -1,4 +1,4 @@
-from wire import *
+from wire import decode_string
 
 # map type_byte to message name
 message_types = {
@@ -15,7 +15,10 @@ message_types = {
 }
 
 # return the decoded arguments of tmsp messages
+
+
 class RequestDecoder():
+
     def __init__(self, reader):
         self.reader = reader
 
@@ -50,5 +53,3 @@ class RequestDecoder():
     def rm_listener(self):
         # TODO
         return
-
-

example/python/tmsp/reader.py

@@ -1,6 +1,9 @@
 
 # Simple read() method around a bytearray
+
+
 class BytesBuffer():
+
     def __init__(self, b):
         self.buf = b
         self.readCount = 0
@@ -32,7 +35,10 @@ class BytesBuffer():
         return r
 
 # Buffer bytes off a tcp connection and read them off in chunks
+
+
 class ConnReader():
+
     def __init__(self, conn):
         self.conn = conn
         self.buf = bytearray()

example/python/tmsp/server.py

@@ -1,16 +1,18 @@
 import socket
 import select
 import sys
-import os
 
 
-from wire import *
-from reader import *
-from msg import *
+from wire import decode_varint, encode
+from reader import BytesBuffer
+from msg import RequestDecoder, message_types
 
 # hold the asyncronous state of a connection
 # ie. we may not get enough bytes on one read to decode the message
+
+
 class Connection():
+
     def __init__(self, fd, appCtx):
         self.fd = fd
         self.appCtx = appCtx
@@ -27,10 +29,14 @@ class Connection():
         this.recBuf.write(data)
 
 # TMSP server responds to messges by calling methods on the app
+
+
 class TMSPServer():
+
     def __init__(self, app, port=5410):
         self.app = app
-	self.appMap = {} # map conn file descriptors to (appContext, reqBuf, resBuf, msgDecoder)
+        # map conn file descriptors to (appContext, reqBuf, resBuf, msgDecoder)
+        self.appMap = {}
 
         self.port = port
         self.listen_backlog = 10
@@ -71,7 +77,7 @@ class TMSPServer():
                 print "recv loop"
                 # check if we need more data first
                 if conn.inProgress:
-			    if conn.msgLength == 0 or conn.recBuf.size() < conn.msgLength:
+                    if (conn.msgLength == 0 or conn.recBuf.size() < conn.msgLength):
                         conn.recv()
                 else:
                     if conn.recBuf.size() == 0:
@@ -94,7 +100,8 @@ class TMSPServer():
 
                 # now we can decode the message
 
-		    # first read the request type and get the particular msg decoder
+                # first read the request type and get the particular msg
+                # decoder
                 typeByte = conn.recBuf.read(1)
                 typeByte = int(typeByte[0])
                 resTypeByte = typeByte + 0x10
@@ -104,7 +111,6 @@ class TMSPServer():
                     # messages are length prefixed
                     conn.resBuf.write(encode(1))
                     conn.resBuf.write([resTypeByte])
-			    sent = conn.fd.send(str(conn.resBuf.buf))
                     conn.msgLength = 0
                     conn.inProgress = False
                     conn.resBuf = BytesBuffer(bytearray())
@@ -121,7 +127,7 @@ class TMSPServer():
                 conn.inProgress = False
 
                 req_f = getattr(conn.appCtx, req_type)
-		    if req_args == None:
+                if req_args is None:
                     res = req_f()
                 elif isinstance(req_args, tuple):
                     res = req_f(*req_args)
@@ -164,13 +170,15 @@ class TMSPServer():
                 self.handle_conn_closed(r)
                 return
             except Exception as e:
-			print "error reading from connection", str(e) # sys.exc_info()[0] # TODO better
+                # sys.exc_info()[0] # TODO better
+                print "error reading from connection", str(e)
                 self.handle_conn_closed(r)
                 return
 
     def main_loop(self):
         while not self.shutdown:
-            r_list, w_list, _ = select.select(self.read_list, self.write_list, [], 2.5)
+            r_list, w_list, _ = select.select(
+                self.read_list, self.write_list, [], 2.5)
 
             for r in r_list:
                 if (r == self.listener):
@@ -178,7 +186,7 @@ class TMSPServer():
                         self.handle_new_connection(r)
 
                         # undo adding to read list ...
-                    except rameError as e: 
+                    except NameError as e:
                         print "Could not connect due to NameError:", e
                     except TypeError as e:
                         print "Could not connect due to TypeError:", e
@@ -187,14 +195,12 @@ class TMSPServer():
                 else:
                     self.handle_recv(r)
 
-
-
     def handle_shutdown(self):
         for r in self.read_list:
             r.close()
         for w in self.write_list:
             try:
                 w.close()
-            except: pass
+            except:
+                pass
         self.shutdown = True
-

example/python/tmsp/wire.py

@@ -2,9 +2,11 @@
 # the decoder works off a reader
 # the encoder returns bytearray
 
+
 def hex2bytes(h):
     return bytearray(h.decode('hex'))
 
+
 def bytes2hex(b):
     if type(b) in (str, unicode):
         return "".join([hex(ord(c))[2:].zfill(2) for c in b])
@@ -22,11 +24,14 @@ def uvarint_size(i):
     return 8
 
 # expects i < 2**size
+
+
 def encode_big_endian(i, size):
     if size == 0:
         return bytearray()
     return encode_big_endian(i / 256, size - 1) + bytearray([i % 256])
 
+
 def decode_big_endian(reader, size):
     if size == 0:
         return 0
@@ -34,6 +39,8 @@ def decode_big_endian(reader, size):
     return firstByte * (256 ** (size - 1)) + decode_big_endian(reader, size - 1)
 
 # ints are max 16 bytes long
+
+
 def encode_varint(i):
     negate = False
     if i < 0:
@@ -48,32 +55,40 @@ def encode_varint(i):
     return bytearray([size]) + big_end
 
 # returns the int and whats left of the byte array
+
+
 def decode_varint(reader):
     size = reader.read(1)[0]
     if size == 0:
         return 0
 
     negate = True if size > int(0xF0) else False
-	if negate: size = size -0xF0
+    if negate:
+        size = size - 0xF0
     i = decode_big_endian(reader, size)
-	if negate: i = i*(-1)
+    if negate:
+        i = i * (-1)
     return i
 
+
 def encode_string(s):
     size = encode_varint(len(s))
     return size + bytearray(s)
 
+
 def decode_string(reader):
     length = decode_varint(reader)
     return str(reader.read(length))
 
+
 def encode_list(s):
     b = bytearray()
     map(b.extend, map(encode, s))
     return encode_varint(len(s)) + b
 
+
 def encode(s):
-	if s == None:
+    if s is None:
         return bytearray()
     if isinstance(s, int):
         return encode_varint(s)
@@ -85,8 +100,6 @@ def encode(s):
         print "UNSUPPORTED TYPE!", type(s), s
 
 
-import binascii
-	
 if __name__ == '__main__':
     ns = [100, 100, 1000, 256]
     ss = [2, 5, 5, 2]