Index: cfe/trunk/utils/ABITest/Enumeration.py
===================================================================
--- cfe/trunk/utils/ABITest/Enumeration.py
+++ cfe/trunk/utils/ABITest/Enumeration.py
@@ -46,7 +46,8 @@
 def base(line):
     return line*(line+1)//2
 
-def pairToN((x,y)):
+def pairToN(pair):
+    x,y = pair
     line,index = x+y,y
     return base(line)+index
 
Index: cfe/trunk/utils/ABITest/TypeGen.py
===================================================================
--- cfe/trunk/utils/ABITest/TypeGen.py
+++ cfe/trunk/utils/ABITest/TypeGen.py
@@ -99,7 +99,8 @@
                             ' '.join(map(getField, self.fields)))
 
     def getTypedefDef(self, name, printer):
-        def getField((i, t)):
+        def getField(it):
+            i, t = it
             if t.isBitField():
                 if t.isPaddingBitField():
                     return '%s : 0;'%(printer.getTypeName(t),)