commit 10fe5c2c6a97bdd2b44331199a40cd5e03e7f42f
author Dan Talayco <dtalayco@stanford.edu> Sun Feb 07 23:05:29 2010 -0800
committer Dan Talayco <dtalayco@stanford.edu> Sun Feb 07 23:05:29 2010 -0800
tree 6ff67d2ed1c1090ab5531e3779d2389afe2488ec
parent 6d2470b14b0b2f388cd10110d6716a60a861096f

Fixed tuple dereference

tools/pylibopenflow/pylib/cpythonize.py

diff --git a/tools/pylibopenflow/pylib/cpythonize.py b/tools/pylibopenflow/pylib/cpythonize.py
index 2fcdc9f..790e24d 100644
--- a/tools/pylibopenflow/pylib/cpythonize.py
+++ b/tools/pylibopenflow/pylib/cpythonize.py
@@ -428,6 +428,7 @@
             if (isinstance(member, cheader.carray) and member.size == 0):
                 if (isinstance(member.object, cheader.cstruct)):
                     code.append(self.tab*2+"for i in self."+member.name+":")
+                    # FIXME:  Is this right?  Doesn't seem to be called
                     code.append(self.tab*3+"l += i.length()")
                 else:
                     pattern="!"+self.__c2py.get_pattern(member.object)
@@ -549,8 +550,14 @@
         """
         if (primPattern != ""):
             #Clear prior primitives
-            code.append(self.tab*2+"("+str(primMemberNames).replace("'","")[1:-1]+\
-                        ") = struct.unpack_from(\""+\
-                        prefix+primPattern+"\", binaryString, "+str(offset)+")")
+            if len(primMemberNames) == 1:
+                code.append(self.tab*2 + "(" + str(primMemberNames[0]) + 
+                            ",) = struct.unpack_from(\"" + prefix+primPattern
+                            + "\", binaryString, " + str(offset) + ")")
+            else:
+                code.append(self.tab*2+"("+str(primMemberNames).replace("'","")[1:-1]+
+                            ") = struct.unpack_from(\""+
+                            prefix+primPattern+"\", binaryString, "+str(offset)+")")
+
         return ("",[], offset+struct.calcsize(prefix+primPattern))