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>

4 files changed, 15 insertions, 11 deletions

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 7b04dcdb36..c63030a16e 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -12,6 +12,7 @@
 

 ## Import Modules

 #

+from __future__ import print_function

 from Common.GlobalData import *

 from CommonDataClass.Exceptions import BadExpression

 from CommonDataClass.Exceptions import WrnExpression

@@ -1028,10 +1029,10 @@ if __name__ == '__main__':
         if input in 'qQ':

             break

         try:

-            print ValueExpression(input)(True)

-            print ValueExpression(input)(False)

+            print(ValueExpression(input)(True))

+            print(ValueExpression(input)(False))

         except WrnExpression as Ex:

-            print Ex.result

-            print str(Ex)

+            print(Ex.result)

+            print(str(Ex))

         except Exception as Ex:

-            print str(Ex)

+            print(str(Ex))

diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index b6f9944705..4c29bc9ee4 100644
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -12,6 +12,7 @@
 

 # # Import Modules

 #

+from __future__ import print_function

 from Common.GlobalData import *

 from CommonDataClass.Exceptions import BadExpression

 from CommonDataClass.Exceptions import WrnExpression

@@ -85,11 +86,11 @@ class RangeContainer(object):
         self.__clean__()

         

     def dump(self):

-        print "----------------------"

+        print("----------------------")

         rangelist = ""

         for object in self.rangelist:

             rangelist = rangelist + "[%d , %d]" % (object.start, object.end)

-        print rangelist

+        print(rangelist)

         

         

 class XOROperatorObject(object):   

diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
index f8459c892e..8ba8dd31a8 100644
--- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py
+++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
@@ -14,6 +14,7 @@
 ##

 # Import Modules

 #

+from __future__ import print_function

 import Common.LongFilePathOs as os

 import EdkLogger

 import DataType

@@ -158,6 +159,6 @@ def TargetTxtDict(ConfDir):
 if __name__ == '__main__':

     pass

     Target = TargetTxtDict(os.getenv("WORKSPACE"))

-    print Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]

-    print Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]

-    print Target.TargetTxtDictionary

+    print(Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER])

+    print(Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET])

+    print(Target.TargetTxtDictionary)

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 8ff544ed76..09b8196faf 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -15,6 +15,7 @@
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

+from __future__ import print_function

 import Common.LongFilePathOs as os

 import re

 import Common.EdkLogger as EdkLogger

@@ -248,7 +249,7 @@ def CallExtenalBPDGTool(ToolPath, VpdFileName):
     except Exception as X:

         EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData=str(X))

     (out, error) = PopenObject.communicate()

-    print out

+    print(out)

     while PopenObject.returncode is None :

         PopenObject.wait()