BaseTools: remove un-needed use of .keys() on dictionaries

sometimes just delete it.
sometimes the loop needed .values() instead

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>

2 files changed, 4 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 5228e15526..ef5896d76b 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -439,7 +439,7 @@ class FV (FvClassObject):
         # Add [Files]

         #

         self.FvInfFile.writelines("[files]" + T_CHAR_LF)

-        if VtfDict is not None and self.UiFvName in VtfDict:

+        if VtfDict and self.UiFvName in VtfDict:

             self.FvInfFile.writelines("EFI_FILE_NAME = "                   + \

                                        VtfDict[self.UiFvName]              + \

                                        T_CHAR_LF)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index d6b8b761d6..e2af803420 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1200,7 +1200,7 @@ class DscBuildData(PlatformBuildClassObject):
         for item in GlobalData.BuildOptionPcd:

             if len(item) == 5 and (item[1],item[0]) in StruPcds:

                 StructurePcdInCom[(item[0],item[1],item[2] )] = (item[3],item[4])

-        GlobalPcds = set([(item[0],item[1]) for item in StructurePcdInCom.keys()])

+        GlobalPcds = {(item[0],item[1]) for item in StructurePcdInCom}

         for Pcd in StruPcds.values():

             if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) not in GlobalPcds:

                 continue

@@ -1276,7 +1276,7 @@ class DscBuildData(PlatformBuildClassObject):
         DefaultStoreMgr = DefaultStore(self.DefaultStores)

         SkuIds = self.SkuIdMgr.AvailableSkuIdSet

         SkuIds.update({TAB_DEFAULT:0})

-        DefaultStores = set([storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])

+        DefaultStores = {storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict}

 

         S_PcdSet = []

         # Find out all possible PCD candidates for self._Arch

@@ -2332,7 +2332,7 @@ class DscBuildData(PlatformBuildClassObject):
         Pcds = {}

         DefaultStoreObj = DefaultStore(self._GetDefaultStores())

         SkuIds = {skuname:skuid for skuname,skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname != TAB_COMMON}

-        DefaultStores = set([storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])

+        DefaultStores = set([storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict])

         for PcdCName, TokenSpaceGuid in PcdSet:

             PcdObj = PcdSet[(PcdCName, TokenSpaceGuid)]

             self.CopyDscRawValue(PcdObj)