commit 6f223c841534e682d00f40f6341230f4264beb71
author Dan Talayco <dtalayco@stanford.edu> Fri Mar 12 13:56:27 2010 -0800
committer Dan Talayco <dtalayco@stanford.edu> Fri Mar 12 13:56:27 2010 -0800
tree 940cf9982c7e0fd1d5071b7c7d59a49e05a3f4ec
parent 9f088483ac78d32547ff99e3d7c3a8fd4e2234b0

Make unpack Python 2.4 compliant

tools/pylibopenflow/pylib/cpythonize.py

diff --git a/tools/pylibopenflow/pylib/cpythonize.py b/tools/pylibopenflow/pylib/cpythonize.py
index 498d41e..89c9a84 100644
--- a/tools/pylibopenflow/pylib/cpythonize.py
+++ b/tools/pylibopenflow/pylib/cpythonize.py
@@ -530,9 +530,11 @@
                         for x in range(0, member.size):
                             expandedarr += "self."+member.name+"["+\
                                            str(x).strip()+"], "
-                        code.append(self.tab*2+"("+expandedarr[:-2]+") = struct.unpack_from(\""+\
-                                    prefix+arrpattern+\
-                                    "\", binaryString, "+str(offset)+")")
+                        code.append(self.tab*2 + "fmt = '" + prefix+arrpattern + "'")
+                        code.append(self.tab*2 + "start = " + str(offset))
+                        code.append(self.tab*2 + "end = start + struct.calcsize(fmt)")
+                        code.append(self.tab*2 + "("+expandedarr[:-2] + 
+                                    ") = struct.unpack(fmt, binaryString[start:end])")
                         offset += struct.calcsize(prefix + arrpattern)
                 elif (isinstance(member, cheader.carray) and \
                       isinstance(member.object, cheader.cstruct)):
@@ -555,14 +557,15 @@
         """
         if (primPattern != ""):
             #Clear prior primitives
+            code.append(self.tab*2 + "fmt = '" + prefix + primPattern + "'")
+            code.append(self.tab*2 + "start = " + str(offset))
+            code.append(self.tab*2 + "end = start + struct.calcsize(fmt)")
             if len(primMemberNames) == 1:
                 code.append(self.tab*2 + "(" + str(primMemberNames[0]) + 
-                            ",) = struct.unpack_from(\"" + prefix+primPattern
-                            + "\", binaryString, " + str(offset) + ")")
+                            ",) = struct.unpack(fmt, binaryString[start:end])")
             else:
                 code.append(self.tab*2+"("+str(primMemberNames).replace("'","")[1:-1]+
-                            ") = struct.unpack_from(\""+
-                            prefix+primPattern+"\", binaryString, "+str(offset)+")")
+                            ") = struct.unpack(fmt,  binaryString[start:end])")
 
         return ("",[], offset+struct.calcsize(prefix+primPattern))