## @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
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
from PomAdapter.InfPomAlignmentMisc import GenBinaryData\r
from Parser import InfParser\r
from PomAdapter.DecPomAlignment import DecPomAlignment\r
-\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
\r
## InfPomAlignment\r
#\r
#\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
# 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
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
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
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
#\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
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
PackageDependency.SetSupArchList(ConvertArchList(PackageItemObj.GetSupArchList()))\r
PackageDependency.SetFeatureFlag(PackageItemObj.GetFeatureFlagExp())\r
\r
- PkgInfo = GetPkgInfoFromDec(os.path.normpath(os.path.join(self.WorkSpace,\r
- NormPath(PackageItemObj.GetPackageName()))))\r
+ PkgInfo = GetPkgInfoFromDec(mws.join(self.WorkSpace, NormPath(PackageItemObj.GetPackageName())))\r
if PkgInfo[1] and PkgInfo[2]:\r
PackageDependency.SetGuid(PkgInfo[1])\r
PackageDependency.SetVersion(PkgInfo[2])\r