From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9C9CA225264AB for ; Thu, 5 Apr 2018 16:14:07 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2018 16:14:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,412,1517904000"; d="scan'208";a="189047119" Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.141]) by orsmga004.jf.intel.com with ESMTP; 05 Apr 2018 16:14:05 -0700 From: Jaben Carsey To: edk2-devel@lists.01.org Cc: Liming Gao , Yonghong Zhu Date: Thu, 5 Apr 2018 16:14:02 -0700 Message-Id: <14593a5f937eed96986ff2f01ade60055b9d79f0.1522969978.git.jaben.carsey@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH v1 14/14] BaseTools: refactor and remove out of date use of .keys() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Apr 2018 23:14:08 -0000 this is no longer required to make dictionary objects iterable. Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Scripts/SmiHandlerProfileSymbolGen.py | 4 ++-- BaseTools/Source/Python/AutoGen/GenMake.py | 2 +- BaseTools/Source/Python/GenFds/Fv.py | 2 +- BaseTools/Source/Python/GenFds/Section.py | 5 +---- BaseTools/Source/Python/TargetTool/TargetTool.py | 3 +-- BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py | 5 +---- BaseTools/Source/Python/build/build.py | 4 +--- 7 files changed, 8 insertions(+), 17 deletions(-) diff --git a/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py b/BaseTools/Scripts/SmiHandlerProfileSymbolGen.py index f03278b64f8f..26c092410386 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 dcdfcca1a5b0..61432516fd26 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -491,7 +491,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 14e36b885966..345ad3bdcc90 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 5e0b4bee7d1c..6335c249a693 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 ede9713c9b8b..143b53ec35ef 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 e37a0b6c3be7..165ac111272a 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 f211f8c64116..ceacc124933c 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1421,9 +1421,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] -- 2.16.2.windows.1