cleanup of osc.py - cont.

Author: gabriel pettier

kivy/lib/osc/OSC.py

@@ -93,38 +93,38 @@ def rawAppend(self, data):
 
     def getBinary(self):
         """Returns the binary message (so far) with typetags."""
-        address  = OSCArgument(self.address)[1]
+        address = OSCArgument(self.address)[1]
         typetags = OSCArgument(self.typetags)[1]
         return address + typetags + self.message
 
     def __repr__(self):
         return self.getBinary()
 
+
 def readString(data):
-    length   = string.find(data,"\0")
+    length = data.find("\0")
     nextData = int(math.ceil((length+1) / 4.0) * 4)
     return (data[0:length], data[nextData:])
 
 
 def readBlob(data):
-    length   = struct.unpack(">i", data[0:4])[0]
+    length = struct.unpack(">i", data[0:4])[0]
     nextData = int(math.ceil((length) / 4.0) * 4) + 4
     return (data[4:length+4], data[nextData:])
 
 
 def readInt(data):
-    if(len(data)<4):
+    if(len(data) < 4):
         print("Error: too few bytes for int", data, len(data))
         rest = data
         integer = 0
     else:
         integer = struct.unpack(">i", data[0:4])[0]
-        rest    = data[4:]
+        rest = data[4:]
 
     return (integer, rest)
 
 
-
 def readLong(data):
     """Tries to interpret the next 8 bytes of the data
     as a 64-bit signed integer."""
@@ -143,30 +143,29 @@ def readDouble(data):
     return (big, rest)
 
 
-
 def readFloat(data):
-    if(len(data)<4):
+    if(len(data) < 4):
         print("Error: too few bytes for float", data, len(data))
         rest = data
         float = 0
     else:
         float = struct.unpack(">f", data[0:4])[0]
-        rest  = data[4:]
+        rest = data[4:]
 
     return (float, rest)
 
 
-def OSCBlob(next):
+def OSCBlob(data):
     """Convert a string into an OSC Blob,
     returning a (typetag, data) tuple."""
 
-    if type(next) == type(""):
-        length = len(next)
-        padded = math.ceil((len(next)) / 4.0) * 4
-        binary = struct.pack(">i%ds" % (padded), length, next)
-        tag    = 'b'
+    if isinstance(data, string_types):
+        length = len(data)
+        padded = math.ceil((len(data)) / 4.0) * 4
+        binary = struct.pack(">i%ds" % (padded), length, data)
+        tag = 'b'
     else:
-        tag    = ''
+        tag = ''
         binary = ''
 
     return (tag, binary)
@@ -215,10 +214,12 @@ def parseArgs(args):
     return parsed
 
 
-
 def decodeOSC(data):
     """Converts a typetagged OSC message to a Python list."""
-    table = { "i" : readInt, "f" : readFloat, "s" : readString, "b" : readBlob, "d" : readDouble }
+    table = {
+        "i": readInt, "f": readFloat, "s": readString, "b": readBlob,
+        "d": readDouble
+    }
     decoded = []
     address,  rest = readString(data)
     typetags = ""
@@ -227,7 +228,7 @@ def decodeOSC(data):
         time, rest = readLong(rest)
 #       decoded.append(address)
 #       decoded.append(time)
-        while len(rest)>0:
+        while len(rest) > 0:
             length, rest = readInt(rest)
             decoded.append(decodeOSC(rest[:length]))
             rest = rest[length:]
@@ -257,19 +258,19 @@ def __init__(self):
         self.callbacks = {}
         self.add(self.unbundler, "#bundle")
 
-    def handle(self, data, source = None):
+    def handle(self, data, source=None):
         """Given OSC data, tries to call the callback with the
         right address."""
         decoded = decodeOSC(data)
         self.dispatch(decoded, source)
 
-    def dispatch(self, message, source = None):
+    def dispatch(self, message, source=None):
         """Sends decoded OSC data to an appropriate calback"""
-        if type(message[0]) == list :
+        if isinstance(message[0], list):
             # smells like nested messages
-            for msg in message :
+            for msg in message:
                 self.dispatch(msg, source)
-        elif type(message[0]) == str :
+        elif isinstance(message[0], string_types):
             # got a single message
             try:
                 address = message[0]
@@ -297,7 +298,7 @@ def add(self, callback, name):
         """Adds a callback to our set of callbacks,
         or removes the callback with name if callback
         is None."""
-        if callback == None:
+        if callback is None:
             del self.callbacks[name]
         else:
             self.callbacks[name] = callback
@@ -308,13 +309,6 @@ def unbundler(self, messages):
         for message in messages[2:]:
             self.dispatch(message)
 
-
-
-
-
-
-
-
 if __name__ == "__main__":
     hexDump("Welcome to the OSC testing program.")
     print()
@@ -337,7 +331,7 @@ def unbundler(self, messages):
     strings.append(14.5)
     strings.append(-400)
 
-    raw  = strings.getBinary()
+    raw = strings.getBinary()
 
     hexDump(raw)
 
@@ -363,12 +357,12 @@ def unbundler(self, messages):
     print("Testing Blob types.")
 
     blob = OSCMessage()
-    blob.append("","b")
-    blob.append("b","b")
-    blob.append("bl","b")
-    blob.append("blo","b")
-    blob.append("blob","b")
-    blob.append("blobs","b")
+    blob.append("", "b")
+    blob.append("b", "b")
+    blob.append("bl", "b")
+    blob.append("blo", "b")
+    blob.append("blob", "b")
+    blob.append("blobs", "b")
     blob.append(42)
 
     hexDump(blob.getBinary())