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>

2 files changed, 7 insertions, 5 deletions

diff --git a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py b/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py
index ca21e69952..afa5b2407e 100644
--- a/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py
+++ b/BaseTools/Source/Python/UPT/Library/ExpressionValidate.py
@@ -14,6 +14,7 @@
 '''

 ExpressionValidate

 '''

+from __future__ import print_function

 

 ##

 # Import Modules

@@ -566,7 +567,7 @@ def IsValidFeatureFlagExp(Token, Flag=False):
 

 if __name__ == '__main__':

 #    print IsValidRangeExpr('LT 9')

-    print _LogicalExpressionParser('gCrownBayTokenSpaceGuid.PcdPciDevice1BridgeAddressLE0').IsValidLogicalExpression()

+    print(_LogicalExpressionParser('gCrownBayTokenSpaceGuid.PcdPciDevice1BridgeAddressLE0').IsValidLogicalExpression())

 

 

     

diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
index 299cd87144..a464cbf702 100644
--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
@@ -14,6 +14,7 @@
 """

 Collect all defined strings in multiple uni files

 """

+from __future__ import print_function

 

 ##

 # Import Modules

@@ -730,7 +731,7 @@ class UniFileClassObject(object):
                     EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path)

                 NewLines.append(Line)

             else:

-                print Line

+                print(Line)

                 EdkLogger.Error("Unicode File Parser", ToolError.FORMAT_INVALID, ExtraData=File.Path)

                     

         if StrName and not StrName.split()[1].startswith(u'STR_'):

@@ -1022,12 +1023,12 @@ class UniFileClassObject(object):
     # Show the instance itself

     #

     def ShowMe(self):

-        print self.LanguageDef

+        print(self.LanguageDef)

         #print self.OrderedStringList

         for Item in self.OrderedStringList:

-            print Item

+            print(Item)

             for Member in self.OrderedStringList[Item]:

-                print str(Member)

+                print(str(Member))

     

     #

     # Read content from '!include' UNI file