BaseTools ConvertMasmToNasm: put filter/map result in tuple for python3

Python 3's filter and map functions returns an iterator which you
can't call len() on. Since we'll want to use len() later, we put the
filter results into a tuple.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Scripts/ConvertMasmToNasm.py b/BaseTools/Scripts/ConvertMasmToNasm.py
index 8b08a8855708955b43dee918bbf8885aa56ac21a..6343fbd94c6df4c9ff4725ef6a47a47707408e44 100755 (executable)
--- a/BaseTools/Scripts/ConvertMasmToNasm.py
+++ b/BaseTools/Scripts/ConvertMasmToNasm.py
@@ -473,7 +473,7 @@ class ConvertAsmFile(CommonUtils):
             self.EmitAsmWithComment(oldAsm, newAsm, endOfLine)\r
             uses = self.mo.group(3)\r
             if uses is not None:\r
-                uses = filter(None, uses.split())\r
+                uses = tuple(filter(None, uses.split()))\r
             else:\r
                 uses = tuple()\r
             self.uses = uses\r
@@ -484,7 +484,7 @@ class ConvertAsmFile(CommonUtils):
             self.EmitAsmWithComment(oldAsm, newAsm, endOfLine)\r
         elif self.MatchAndSetMo(self.publicRe, oldAsm):\r
             publics = re.findall(self.varAndTypeSubRe, self.mo.group(1))\r
-            publics = map(lambda p: p.split(':')[0].strip(), publics)\r
+            publics = tuple(map(lambda p: p.split(':')[0].strip(), publics))\r
             for i in range(len(publics) - 1):\r
                 name = publics[i]\r
                 self.EmitNewContent('global ASM_PFX(%s)' % publics[i])\r