BaseTools: Refactor python print statements

Refactor print statements to be compatible with python 3.
Based on "futurize -f libfuturize.fixes.fix_print_with_import"

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

3 files changed, 8 insertions, 5 deletions

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index a99a5e7ac6..6b4f724f6d 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -16,6 +16,7 @@
 ##

 # Import Modules

 #

+from __future__ import print_function

 import re

 

 import Fd

@@ -4777,7 +4778,7 @@ if __name__ == "__main__":
     try:

         test_file = sys.argv[1]

     except IndexError as v:

-        print "Usage: %s filename" % sys.argv[0]

+        print("Usage: %s filename" % sys.argv[0])

         sys.exit(1)

 

     parser = FdfParser(test_file)

@@ -4785,7 +4786,7 @@ if __name__ == "__main__":
         parser.ParseFile()

         parser.CycleReferenceCheck()

     except Warning as X:

-        print str(X)

+        print(str(X))

     else:

-        print "Success!"

+        print("Success!")

 

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index ba3950dacd..1552ab4ee3 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -15,6 +15,7 @@
 ##

 # Import Modules

 #

+from __future__ import print_function

 from optparse import OptionParser

 import sys

 import Common.LongFilePathOs as os

@@ -689,7 +690,7 @@ class GenFds :
         ModuleDict = BuildDb.BuildObject[DscFile, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].Modules

         for Key in ModuleDict:

             ModuleObj = BuildDb.BuildObject[Key, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]

-            print ModuleObj.BaseName + ' ' + ModuleObj.ModuleType

+            print(ModuleObj.BaseName + ' ' + ModuleObj.ModuleType)

 

     def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj):

         GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir, "Guid.xref")

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index c1d6562276..73b52030d9 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -15,6 +15,7 @@
 ##

 # Import Modules

 #

+from __future__ import print_function

 import Common.LongFilePathOs as os

 import sys

 import subprocess

@@ -736,7 +737,7 @@ class GenFdsGlobalVariable:
             GenFdsGlobalVariable.InfLogger (out)

             GenFdsGlobalVariable.InfLogger (error)

             if PopenObject.returncode != 0:

-                print "###", cmd

+                print("###", cmd)

                 EdkLogger.error("GenFds", COMMAND_FAILURE, errorMess)

 

     def VerboseLogger (msg):