sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: refactor and remove out of date use of .keys()

Browse Source 
this is no longer required to make dictionary objects iterable.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben
2018-04-06 07:14:02 +08:00
committed by Yonghong Zhu
parent 674e2014ce
commit 98120f5fe2
7 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseTools/Scripts/SmiHandlerProfileSymbolGen.py
View File

@@ -204,7 +204,7 @@ def genGuidString(guidreffile):
if len(guidLineList) == 2: if len(guidLineList) == 2:
guid = guidLineList[0] guid = guidLineList[0]
guidName = guidLineList[1] guidName = guidLineList[1]
if guid not in dictGuid.keys() : if guid not in dictGuid :
dictGuid[guid] = guidName dictGuid[guid] = guidName
def createSym(symbolName): def createSym(symbolName):
@@ -256,7 +256,7 @@ def main():
for smiEntry in SmiEntry: for smiEntry in SmiEntry:
if smiEntry.hasAttribute("HandlerType"): if smiEntry.hasAttribute("HandlerType"):
guidValue = smiEntry.getAttribute("HandlerType") guidValue = smiEntry.getAttribute("HandlerType")
if guidValue in dictGuid.keys() : if guidValue in dictGuid:
smiEntry.setAttribute("HandlerType", dictGuid[guidValue]) smiEntry.setAttribute("HandlerType", dictGuid[guidValue])
SmiHandler = smiEntry.getElementsByTagName("SmiHandler") SmiHandler = smiEntry.getElementsByTagName("SmiHandler")
for smiHandler in SmiHandler: for smiHandler in SmiHandler:

2
BaseTools/Source/Python/AutoGen/GenMake.py
View File

@@ -492,7 +492,7 @@ cleanlib:
ImageEntryPoint = "_ModuleEntryPoint" ImageEntryPoint = "_ModuleEntryPoint"
for k, v in self._AutoGenObject.Module.Defines.iteritems(): for k, v in self._AutoGenObject.Module.Defines.iteritems():
if k not in self._AutoGenObject.Macros.keys(): if k not in self._AutoGenObject.Macros:
self._AutoGenObject.Macros[k] = v self._AutoGenObject.Macros[k] = v
if 'MODULE_ENTRY_POINT' not in self._AutoGenObject.Macros.keys(): if 'MODULE_ENTRY_POINT' not in self._AutoGenObject.Macros.keys():

2
BaseTools/Source/Python/GenFds/Fv.py
View File

@@ -318,7 +318,7 @@ class FV (FvClassObject):
' %s' %ErasePloarity + \ ' %s' %ErasePloarity + \
T_CHAR_LF) T_CHAR_LF)
if not (self.FvAttributeDict is None): if not (self.FvAttributeDict is None):
for FvAttribute in self.FvAttributeDict.keys() : for FvAttribute in self.FvAttributeDict:
if FvAttribute == "FvUsedSizeEnable": if FvAttribute == "FvUsedSizeEnable":
if self.FvAttributeDict[FvAttribute].upper() in ('TRUE', '1') : if self.FvAttributeDict[FvAttribute].upper() in ('TRUE', '1') :
self.UsedSizeEnable = True self.UsedSizeEnable = True

5
BaseTools/Source/Python/GenFds/Section.py
View File

@@ -111,10 +111,7 @@ class Section (SectionClassObject):
# @retval tuple (File list, boolean) # @retval tuple (File list, boolean)
# #
def GetFileList(FfsInf, FileType, FileExtension, Dict = {}, IsMakefile=False): def GetFileList(FfsInf, FileType, FileExtension, Dict = {}, IsMakefile=False):
if FileType in Section.SectFileType.keys() : IsSect = FileType in Section.SectFileType
IsSect = True
else :
IsSect = False
if FileExtension is not None: if FileExtension is not None:
Suffix = FileExtension Suffix = FileExtension

3
BaseTools/Source/Python/TargetTool/TargetTool.py
View File

@@ -80,9 +80,8 @@ class TargetTool():
traceback.print_exception(last_type, last_value, last_tb) traceback.print_exception(last_type, last_value, last_tb)
def Print(self): def Print(self):
KeyList = self.TargetTxtDictionary.keys()
errMsg = '' errMsg = ''
for Key in KeyList: for Key in self.TargetTxtDictionary:
if type(self.TargetTxtDictionary[Key]) == type([]): if type(self.TargetTxtDictionary[Key]) == type([]):
print "%-30s = %s" % (Key, ''.join(elem + ' ' for elem in self.TargetTxtDictionary[Key])) print "%-30s = %s" % (Key, ''.join(elem + ' ' for elem in self.TargetTxtDictionary[Key]))
elif self.TargetTxtDictionary[Key] is None: elif self.TargetTxtDictionary[Key] is None:

5
BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
View File

@@ -486,10 +486,7 @@ class InfPomAlignment(ModuleObject):
# #
# Get all LibraryClasses # Get all LibraryClasses
# #
LibClassObj = self.Parser.InfLibraryClassSection.LibraryClasses for LibraryClassData in self.Parser.InfLibraryClassSection.LibraryClasses.values():
Keys = LibClassObj.keys()
for Key in Keys:
LibraryClassData = LibClassObj[Key]
for Item in LibraryClassData: for Item in LibraryClassData:
LibraryClass = CommonObject.LibraryClassObject() LibraryClass = CommonObject.LibraryClassObject()
LibraryClass.SetUsage(DT.USAGE_ITEM_CONSUMES) LibraryClass.SetUsage(DT.USAGE_ITEM_CONSUMES)

4
BaseTools/Source/Python/build/build.py
View File

@@ -1423,9 +1423,7 @@ class Build():
def _RebaseModule (self, MapBuffer, BaseAddress, ModuleList, AddrIsOffset = True, ModeIsSmm = False): def _RebaseModule (self, MapBuffer, BaseAddress, ModuleList, AddrIsOffset = True, ModeIsSmm = False):
if ModeIsSmm: if ModeIsSmm:
AddrIsOffset = False AddrIsOffset = False
InfFileNameList = ModuleList.keys() for InfFile in ModuleList:
#InfFileNameList.sort()
for InfFile in InfFileNameList:
sys.stdout.write (".") sys.stdout.write (".")
sys.stdout.flush() sys.stdout.flush()
ModuleInfo = ModuleList[InfFile] ModuleInfo = ModuleList[InfFile]