BaseTools/UPT: Update the import statement to use StringUtils

[mirror_edk2.git] / BaseTools / Source / Python / UPT / PomAdapter / InfPomAlignment.py

diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index a15173285345074de96700b27e7f72fae1eeb5c9..a5929e15de2d68d6677fce10ae4683b658f21cce 100644 (file)
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -1,7 +1,7 @@
 ## @file InfPomAlignment.py\r
 # This file contained the adapter for convert INF parser object to POM Object\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -20,10 +20,10 @@ InfPomAlignment
 import os.path\r
 from Logger import StringTable as ST\r
 import Logger.Log as Logger\r
-from Library.String import FORMAT_INVALID\r
-from Library.String import PARSER_ERROR\r
-from Library.String import NormPath\r
-from Library.String import GetSplitValueList\r
+from Library.StringUtils import FORMAT_INVALID\r
+from Library.StringUtils import PARSER_ERROR\r
+from Library.StringUtils import NormPath\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.Misc import ConvertVersionToDecimal\r
 from Library.Misc import GetHelpStringByRemoveHashKey\r
 from Library.Misc import ConvertArchList\r
@@ -167,11 +167,11 @@ class InfPomAlignment(ModuleObject):
         #\r
         # Convert UEFI/PI version to decimal number\r
         #\r
-        if DefineObj.GetUefiSpecificationVersion() != None:\r
+        if DefineObj.GetUefiSpecificationVersion() is not None:\r
             __UefiVersion = DefineObj.GetUefiSpecificationVersion().GetValue()\r
             __UefiVersion = ConvertVersionToDecimal(__UefiVersion)\r
             self.SetUefiSpecificationVersion(str(__UefiVersion))\r
-        if DefineObj.GetPiSpecificationVersion() != None:\r
+        if DefineObj.GetPiSpecificationVersion() is not None:\r
             __PiVersion = DefineObj.GetPiSpecificationVersion().GetValue()\r
             __PiVersion = ConvertVersionToDecimal(__PiVersion)\r
 \r
@@ -186,7 +186,7 @@ class InfPomAlignment(ModuleObject):
         # must exist items in INF define section\r
         # MODULE_TYPE/BASE_NAME/INF_VERSION/FILE_GUID/VERSION_STRING \r
         #\r
-        if DefineObj.GetModuleType() == None:\r
+        if DefineObj.GetModuleType() is None:\r
             Logger.Error("InfParser", FORMAT_INVALID,\r
                          ST.ERR_INF_PARSER_DEFINE_SECTION_MUST_ITEM_NOT_EXIST % ("MODULE_TYPE"), File=self.FullPath)\r
         else:\r
@@ -205,7 +205,7 @@ class InfPomAlignment(ModuleObject):
                                  Line=DefineObj.ModuleType.CurrentLine.LineNo,\r
                                  ExtraData=DefineObj.ModuleType.CurrentLine.LineString)\r
                 self.LibModuleTypeList.append(ModuleType)\r
-        if DefineObj.GetBaseName() == None:\r
+        if DefineObj.GetBaseName() is None:\r
             Logger.Error("InfParser", FORMAT_INVALID,\r
                          ST.ERR_INF_PARSER_DEFINE_SECTION_MUST_ITEM_NOT_EXIST % ("BASE_NAME"), File=self.FullPath)\r
         else:\r
@@ -214,17 +214,17 @@ class InfPomAlignment(ModuleObject):
             self.UniFileClassObject = UniFileClassObject([PathClass(DefineObj.GetModuleUniFileName())])\r
         else:\r
             self.UniFileClassObject = None\r
-        if DefineObj.GetInfVersion() == None:\r
+        if DefineObj.GetInfVersion() is None:\r
             Logger.Error("InfParser", FORMAT_INVALID,\r
                          ST.ERR_INF_PARSER_DEFINE_SECTION_MUST_ITEM_NOT_EXIST % ("INF_VERSION"), File=self.FullPath)\r
         else:\r
             self.SetVersion(DefineObj.GetInfVersion().GetValue())\r
-        if DefineObj.GetFileGuid() == None:\r
+        if DefineObj.GetFileGuid() is None:\r
             Logger.Error("InfParser", FORMAT_INVALID,\r
                          ST.ERR_INF_PARSER_DEFINE_SECTION_MUST_ITEM_NOT_EXIST % ("FILE_GUID"), File=self.FullPath)\r
         else:\r
             self.SetGuid(DefineObj.GetFileGuid().GetValue())\r
-        if DefineObj.GetVersionString() == None:\r
+        if DefineObj.GetVersionString() is None:\r
             #\r
             # VERSION_STRING is missing from the [Defines] section, tools must assume that the module's version is 0.\r
             #\r
@@ -256,7 +256,7 @@ class InfPomAlignment(ModuleObject):
             if not (ModuleTypeValue == 'SEC' or ModuleTypeValue == 'PEI_CORE' or ModuleTypeValue == 'PEIM'):\r
                 Logger.Error("InfParser", FORMAT_INVALID, ST.ERR_INF_PARSER_DEFINE_SHADOW_INVALID, File=self.FullPath)\r
 \r
-        if DefineObj.GetPcdIsDriver() != None:\r
+        if DefineObj.GetPcdIsDriver() is not None:\r
             self.SetPcdIsDriver(DefineObj.GetPcdIsDriver().GetValue())\r
         #\r
         # LIBRARY_CLASS\r
@@ -486,10 +486,7 @@ class InfPomAlignment(ModuleObject):
             #\r
             # Get all LibraryClasses\r
             #\r
-            LibClassObj = self.Parser.InfLibraryClassSection.LibraryClasses\r
-            Keys = LibClassObj.keys()\r
-            for Key in Keys:\r
-                LibraryClassData = LibClassObj[Key]\r
+            for LibraryClassData in self.Parser.InfLibraryClassSection.LibraryClasses.values():\r
                 for Item in LibraryClassData:\r
                     LibraryClass = CommonObject.LibraryClassObject()\r
                     LibraryClass.SetUsage(DT.USAGE_ITEM_CONSUMES)\r
@@ -499,7 +496,7 @@ class InfPomAlignment(ModuleObject):
                     LibraryClass.SetSupArchList(ConvertArchList(Item.GetSupArchList()))\r
                     LibraryClass.SetSupModuleList(Item.GetSupModuleList())\r
                     HelpStringObj = Item.GetHelpString()\r
-                    if HelpStringObj != None:\r
+                    if HelpStringObj is not None:\r
                         CommentString = GetHelpStringByRemoveHashKey(HelpStringObj.HeaderComments +\r
                                                                      HelpStringObj.TailComments)\r
                         HelpTextHeaderObj = CommonObject.TextObject()\r