From: Carsey, Jaben </o=Intel/ou=Americas01/cn=Workers/cn=Carsey, Jaben>
Date: Thu, 5 Apr 2018 23:14:02 +0000 (+0800)
Subject: BaseTools: refactor and remove out of date use of .keys()
X-Git-Tag: edk2-stable201903~1941
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=98120f5fe2199de29c0cce8e92c692b23adf0cf7

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

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>
---

diff --git a/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py b/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py
index f03278b64f..26c0924103 100644
--- a/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py
+++ b/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py
@@ -204,7 +204,7 @@ def genGuidString(guidreffile):
         if len(guidLineList) == 2:
             guid = guidLineList[0]
             guidName = guidLineList[1]
-            if guid not in dictGuid.keys() :
+            if guid not in dictGuid :
                 dictGuid[guid] = guidName
 
 def createSym(symbolName):
@@ -256,7 +256,7 @@ def main():
         for smiEntry in SmiEntry:
             if smiEntry.hasAttribute("HandlerType"):
                 guidValue = smiEntry.getAttribute("HandlerType")
-                if guidValue in dictGuid.keys() :
+                if guidValue in dictGuid:
                     smiEntry.setAttribute("HandlerType", dictGuid[guidValue])
             SmiHandler = smiEntry.getElementsByTagName("SmiHandler")
             for smiHandler in SmiHandler:
diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 533fdb5423..b7594d8988 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -492,7 +492,7 @@ cleanlib:
             ImageEntryPoint = "_ModuleEntryPoint"
 
         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
 
         if 'MODULE_ENTRY_POINT' not in self._AutoGenObject.Macros.keys():
diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 14e36b8859..345ad3bdcc 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -318,7 +318,7 @@ class FV (FvClassObject):
                                           ' %s' %ErasePloarity    + \
                                           T_CHAR_LF)
         if not (self.FvAttributeDict is None):
-            for FvAttribute in self.FvAttributeDict.keys() :
+            for FvAttribute in self.FvAttributeDict:
                 if FvAttribute == "FvUsedSizeEnable":
                     if self.FvAttributeDict[FvAttribute].upper() in ('TRUE', '1') :
                         self.UsedSizeEnable = True
diff --git a/BaseTools/Source/Python/GenFds/Section.py b/BaseTools/Source/Python/GenFds/Section.py
index 5e0b4bee7d..6335c249a6 100644
--- a/BaseTools/Source/Python/GenFds/Section.py
+++ b/BaseTools/Source/Python/GenFds/Section.py
@@ -111,10 +111,7 @@ class Section (SectionClassObject):
     #   @retval tuple       (File list, boolean)
     #
     def GetFileList(FfsInf, FileType, FileExtension, Dict = {}, IsMakefile=False):
-        if FileType in Section.SectFileType.keys() :
-            IsSect = True
-        else :
-            IsSect = False
+        IsSect = FileType in Section.SectFileType
 
         if FileExtension is not None:
             Suffix = FileExtension
diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/Source/Python/TargetTool/TargetTool.py
index ede9713c9b..143b53ec35 100644
--- a/BaseTools/Source/Python/TargetTool/TargetTool.py
+++ b/BaseTools/Source/Python/TargetTool/TargetTool.py
@@ -80,9 +80,8 @@ class TargetTool():
             traceback.print_exception(last_type, last_value, last_tb)
 
     def Print(self):
-        KeyList = self.TargetTxtDictionary.keys()
         errMsg  = ''
-        for Key in KeyList:
+        for Key in self.TargetTxtDictionary:
             if type(self.TargetTxtDictionary[Key]) == type([]):
                 print "%-30s = %s" % (Key, ''.join(elem + ' ' for elem in self.TargetTxtDictionary[Key]))
             elif self.TargetTxtDictionary[Key] is None:
diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index e37a0b6c3b..165ac11127 100644
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -486,10 +486,7 @@ class InfPomAlignment(ModuleObject):
             #
             # Get all LibraryClasses
             #
-            LibClassObj = self.Parser.InfLibraryClassSection.LibraryClasses
-            Keys = LibClassObj.keys()
-            for Key in Keys:
-                LibraryClassData = LibClassObj[Key]
+            for LibraryClassData in self.Parser.InfLibraryClassSection.LibraryClasses.values():
                 for Item in LibraryClassData:
                     LibraryClass = CommonObject.LibraryClassObject()
                     LibraryClass.SetUsage(DT.USAGE_ITEM_CONSUMES)
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 4aca280984..6fb2e0ed3d 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1423,9 +1423,7 @@ class Build():
     def _RebaseModule (self, MapBuffer, BaseAddress, ModuleList, AddrIsOffset = True, ModeIsSmm = False):
         if ModeIsSmm:
             AddrIsOffset = False
-        InfFileNameList = ModuleList.keys()
-        #InfFileNameList.sort()
-        for InfFile in InfFileNameList:
+        for InfFile in ModuleList:
             sys.stdout.write (".")
             sys.stdout.flush()
             ModuleInfo = ModuleList[InfFile]