BaseTools: Refactor python print statements

[mirror_edk2.git] / BaseTools / Source / Python / Common / TargetTxtClassObject.py

diff --git a/BaseTools/Source/Python/Common/TargetTxtClassObject.py b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
index 387e5152309743b36c38b859e00f08c022b4eaa1..8ba8dd31a8c598f82f201bc402a52247ccc39187 100644 (file)
--- a/BaseTools/Source/Python/Common/TargetTxtClassObject.py
+++ b/BaseTools/Source/Python/Common/TargetTxtClassObject.py
@@ -14,6 +14,7 @@
 ##\r
 # Import Modules\r
 #\r
+from __future__ import print_function\r
 import Common.LongFilePathOs as os\r
 import EdkLogger\r
 import DataType\r
@@ -45,7 +46,7 @@ class TargetTxtClassObject(object):
             DataType.TAB_TAT_DEFINES_BUILD_RULE_CONF                            : '',\r
         }\r
         self.ConfDirectoryPath = ""\r
-        if Filename != None:\r
+        if Filename is not None:\r
             self.LoadTargetTxtFile(Filename)\r
 \r
     ## LoadTargetTxtFile\r
@@ -83,7 +84,7 @@ class TargetTxtClassObject(object):
             self.ConfDirectoryPath = os.path.dirname(FileName)\r
         except:\r
             EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=FileName)\r
-            if F != None:\r
+            if F is not None:\r
                 F.close()\r
 \r
         for Line in F:\r
@@ -137,33 +138,6 @@ class TargetTxtClassObject(object):
         F.close()\r
         return 0\r
 \r
-    ## Print the dictionary\r
-    #\r
-    # Print all items of dictionary one by one\r
-    #\r
-    # @param Dict:  The dictionary to be printed\r
-    #\r
-    def printDict(Dict):\r
-        if Dict != None:\r
-            KeyList = Dict.keys()\r
-            for Key in KeyList:\r
-                if Dict[Key] != '':\r
-                    print Key + ' = ' + str(Dict[Key])\r
-\r
-    ## Print the dictionary\r
-    #\r
-    # Print the items of dictionary which matched with input key\r
-    #\r
-    # @param list:  The dictionary to be printed\r
-    # @param key:   The key of the item to be printed\r
-    #\r
-    def printList(Key, List):\r
-        if type(List) == type([]):\r
-            if len(List) > 0:\r
-                if Key.find(TAB_SPLIT) != -1:\r
-                    print "\n" + Key\r
-                    for Item in List:\r
-                        print Item\r
 ## TargetTxtDict\r
 #\r
 # Load target.txt in input Conf dir\r
@@ -185,6 +159,6 @@ def TargetTxtDict(ConfDir):
 if __name__ == '__main__':\r
     pass\r
     Target = TargetTxtDict(os.getenv("WORKSPACE"))\r
-    print Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER]\r
-    print Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]\r
-    print Target.TargetTxtDictionary\r
+    print(Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER])\r
+    print(Target.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET])\r
+    print(Target.TargetTxtDictionary)\r