From: Serge Guelton <sguelton@quarkslab.com>
Date: Mon, 3 Dec 2018 12:41:35 +0000 (+0000)
Subject: Portable Python script across Python version
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=190ce35ebad517655ca784cf05ff0e5ce206b5bf;p=clang

Portable Python script across Python version

Python3 does not support type destructuring in function parameters.

Differential Revision: https://reviews.llvm.org/D55198

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@348129 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/ABITest/Enumeration.py b/utils/ABITest/Enumeration.py
index eb53e1784e..01830a38cd 100644
--- a/utils/ABITest/Enumeration.py
+++ b/utils/ABITest/Enumeration.py
@@ -46,7 +46,8 @@ aleph0 = Aleph0()
 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
 
diff --git a/utils/ABITest/TypeGen.py b/utils/ABITest/TypeGen.py
index 0768bb77ee..8330340cd3 100644
--- a/utils/ABITest/TypeGen.py
+++ b/utils/ABITest/TypeGen.py
@@ -99,7 +99,8 @@ class RecordType(Type):
                             ' '.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),)