added try except around send() methods

replaces all double quotes with single quotes for readability
renamed a couple of variables in console for readability
put spaces around < and == operator

Author: Federico Fissore

linux/bridge/bridge.py

@@ -21,11 +21,11 @@ def run(self):
       runner.run()
 
   def process(self, data):
-    if data=='XX':
+    if data == 'XX':
       for cmd in self.commands:
-        if "reset" in dir(cmd):
+        if 'reset' in dir(cmd):
           cmd.reset()
-      return ""
+      return ''
 
     cmd = self.commands[data[0]]
     return cmd.run(data[1:])

linux/bridge/console.py

@@ -7,42 +7,45 @@ def __init__(self, port=6571):
     server = socket(AF_INET, SOCK_STREAM)
     server.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
     server.bind(('127.0.0.1', port))
-    server.listen(1) # No connection backlog
+    server.listen(1)  # No connection backlog
     server.setblocking(0)
     self.server = server
     self.clients = [ ]
     self.clients_sendbuffer = { }
     self.sockets = [ server ]
 
     # Data waiting to be transferred to sockets
-    self.sendbuffer = ""
+    self.sendbuffer = ''
     # Data waiting to be transferred to PacketProcessor
-    self.recvbuffer = ""
+    self.recvbuffer = ''
 
   def run(self):
-    rd, wr, err = select(self.sockets, [], self.sockets, 0)
+    sockets_to_read_from, sockets_to_write_to, err = select(self.sockets, [], [], 0)
 
     # Accept new connections
-    if self.server in rd:
+    if self.server in sockets_to_read_from:
       self.accept()
-      rd.remove(self.server)
+      sockets_to_read_from.remove(self.server)
 
     # Read from sockets
-    if len(self.sendbuffer)<1024:
-      for sock in rd:
+    if len(self.sendbuffer) < 1024:
+      for sock in sockets_to_read_from:
         self.socket_receive(sock)
 
     # Write buffers to sockets    
-    rd, wr, err = select([], self.clients, [], 0)
-    for c in wr:
-      buff = self.clients_sendbuffer[c]
-      sent = c.send(buff)
-      self.clients_sendbuffer[c] = buff[sent:]
-    
+    sockets_to_read_from, sockets_to_write_to, err = select([], self.clients, [], 0)
+    for client in sockets_to_write_to:
+      try:
+        buff = self.clients_sendbuffer[client]
+        sent = client.send(buff)
+        self.clients_sendbuffer[client] = buff[sent:]
+      except:
+        self.close(client)
+
     # Drop starving clients
-    for c in self.clients:
-      if len(self.clients_sendbuffer[c])>8192:
-        self.close(c)
+    for client in self.clients:
+      if len(self.clients_sendbuffer[client]) > 8192:
+        self.close(client)
 
   def socket_receive(self, client):
     chunk = client.recv(1024)
@@ -52,9 +55,9 @@ def socket_receive(self, client):
     self.recvbuffer += chunk
 
     # send chunk as echo to all other clients
-    for c in self.clients:
-      if c != client:
-        self.clients_sendbuffer[c] += chunk
+    for current_client in self.clients:
+      if current_client != client:
+        self.clients_sendbuffer[current_client] += chunk
 
   def write(self, data):
     # send chunk to all clients
@@ -64,7 +67,7 @@ def write(self, data):
   def read(self, maxlen):
     if maxlen > len(self.recvbuffer):
       res = self.recvbuffer
-      self.recvbuffer = ""
+      self.recvbuffer = ''
     else:
       res = self.recvbuffer[:maxlen]
       self.recvbuffer = self.recvbuffer[maxlen:]
@@ -74,7 +77,7 @@ def available(self):
     return len(self.recvbuffer)
 
   def is_connected(self):
-    return len(self.clients)>0
+    return len(self.clients) > 0
 
   def accept(self):
     (client, address) = self.server.accept()
@@ -83,7 +86,7 @@ def accept(self):
 
     self.sockets.append(client)
     self.clients.append(client)
-    self.clients_sendbuffer[client] = ""
+    self.clients_sendbuffer[client] = ''
 
   def close(self, sock):
     sock.close()
@@ -96,7 +99,7 @@ def close(self, sock):
 class WRITE_Command:
   def run(self, data):
     console.write(data)
-    return ""
+    return ''
 
 class READ_Command:
   def run(self, data):
@@ -120,6 +123,5 @@ def test():
   while True:
     console.process(1)
 
-if __name__ == "__main__":
+if __name__ == '__main__':
   test()
-  

linux/bridge/mailbox.py

@@ -12,7 +12,7 @@ def __init__(self):
 
   def run(self):
     json_server.run()
-    if json_server.available()>0:
+    if json_server.available() > 0:
       try:
         self.ext_command(json_server.read())
       except:
@@ -23,11 +23,11 @@ def ext_command(self, msg):
       return
     command = msg['command']
 
-    if command=='raw':
+    if command == 'raw':
       self.incoming.append(msg['data'])
       return
 
-    if command=='get':
+    if command == 'get':
       if msg.has_key('key'):
         k = msg['key']
         v = self.data_store_get(k)
@@ -36,14 +36,14 @@ def ext_command(self, msg):
         json_server.write({ 'response' : 'get', 'value' : self.data_store })
       return
 
-    if command=='put':
+    if command == 'put':
       k = msg['key']
       v = msg['value']
       self.data_store_put(k, v)
       json_server.write({ 'response' : 'put', 'key' : k, 'value' : v })
       return
 
-    if command=='delete':
+    if command == 'delete':
       k = msg['key']
       v = self.data_store_get(k)
       if v:
@@ -69,12 +69,12 @@ def send(self, data):
     json_server.write({ 'request' : 'raw', 'data' : data })
 
   def recv(self):
-    if len(self.incoming)>0:
+    if len(self.incoming) > 0:
       return self.incoming.popleft()
     return None
 
   def peek(self):
-    if len(self.incoming)>0:
+    if len(self.incoming) > 0:
       return self.incoming[0]
     else:
       return None
@@ -84,7 +84,7 @@ def peek(self):
 class SEND_Command:
   def run(self, data):
     mailbox.send(data)
-    return ""
+    return ''
 
 class SEND_JSON_Command:
   def run(self, data):
@@ -93,13 +93,13 @@ def run(self, data):
       mailbox.send(obj)
     except:
       mailbox.send(data)
-    return ""
+    return ''
 
 class RECV_Command:
   def run(self, data):
     msg = mailbox.recv()
     if msg is None:
-      return ""
+      return ''
     else:
       return msg
 
@@ -117,7 +117,7 @@ class DATASTORE_GET_Command:
   def run(self, data):
     res = mailbox.data_store_get(data)
     if res is None:
-      return ""
+      return ''
     else:
       return res
 

linux/bridge/packet.py

@@ -20,7 +20,7 @@ def __init__(self, file):
     self.file = file
 
   def write(self, data):
-    while len(data)>0:
+    while len(data) > 0:
       if not self.file is None:
         self.file.write(data[0])
       self.result = self.result ^ ord(data[0])
@@ -34,14 +34,14 @@ def write_crc(self):
 
   def check(self, crc):
     #if self.result != crc:
-    #  print "CRC:" + hex(self.result) + "!" + hex(crc)
+    #  print 'CRC:' + hex(self.result) + '!' + hex(crc)
     return self.result == crc
 
 
 
 def send(index, msg):
   crc = CRC(stdout)
-  crc.write("\xff")        # Packet start
+  crc.write('\xff')        # Packet start
   crc.write(chr(index))    # Message No. inside Pipe
   l = len(msg)
   crc.write(chr(l >> 8))   # Message length
@@ -57,12 +57,12 @@ def __init__(self, reader):
 
   def run(self, data):
     if data[0] != 'X':
-      call(["/usr/bin/blink-start", "100"])
+      call(['/usr/bin/blink-start', '100'])
       return chr(1)
     if data[1:4] != '100':
-      call(["/usr/bin/blink-start", "100"])
+      call(['/usr/bin/blink-start', '100'])
       return chr(2)
-    call(["/usr/bin/blink-stop"])
+    call(['/usr/bin/blink-stop'])
     return chr(0)
 
 class PacketReader:
@@ -88,7 +88,7 @@ def process(self):
       c = self.t_read()
       if c is None:
         return None
-      if ord(c)==0xFF:
+      if ord(c) == 0xFF:
         break
 
     # Read index and len
@@ -111,7 +111,7 @@ def process(self):
     len_t = (ord(len_hi) << 8) + ord(len_lo)
 
     # Read payload
-    data = ""
+    data = ''
     for x in range(len_t):
       c = self.t_read()
       if c is None:
@@ -133,7 +133,7 @@ def process(self):
       return None
 
     # Check for reset command
-    if len(data)==5 and data[0:2]=='XX':
+    if len(data) == 5 and data[0:2] == 'XX':
       self.index = ord(index)
 
     # Check for out-of-order packets

linux/bridge/processes.py

@@ -96,7 +96,7 @@ def __init__(self, processes):
     self.proc = processes
 
   def run(self, data):
-    id = self.proc.create(data.split("\xFE"))
+    id = self.proc.create(data.split('\xFE'))
     if id is None:
       return chr(1) + chr(0);
     return chr(0) + chr(id)
@@ -131,7 +131,7 @@ def __init__(self, processes):
   def run(self, data):
     id = ord(data[0])
     self.proc.clean(id)
-    return ""
+    return ''
 
 class READ_OUTPUT_Command:
   def __init__(self, processes):
@@ -142,7 +142,7 @@ def run(self, data):
     maxlen = ord(data[1])
     res = self.proc.read_output(id, maxlen)
     if res is None:
-      return ""
+      return ''
     return res
 
 class AVAILABLE_OUTPUT_Command:
@@ -164,7 +164,7 @@ def run(self, data):
     id = ord(data[0])
     data = data[1:]
     self.proc.write_input(id, data)
-    return ""
+    return ''
 
 def init(command_processor):
   command_processor.register('R', RUN_Command(processes))