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>

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 5228e155267f269cbb54acaf6347576873882f78..ef5896d76b129bfd3f5abe0d1b1246adcebb6827 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -439,7 +439,7 @@ class FV (FvClassObject):
         # Add [Files]\r
         #\r
         self.FvInfFile.writelines("[files]" + T_CHAR_LF)\r
-        if VtfDict is not None and self.UiFvName in VtfDict:\r
+        if VtfDict and self.UiFvName in VtfDict:\r
             self.FvInfFile.writelines("EFI_FILE_NAME = "                   + \\r
                                        VtfDict[self.UiFvName]              + \\r
                                        T_CHAR_LF)\r

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index d6b8b761d607db80b04e551341d8dbbe88e4d027..e2af803420f6b5f62c433777d061e7345f4743a8 100644 (file)
--- 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:\r
             if len(item) == 5 and (item[1],item[0]) in StruPcds:\r
                 StructurePcdInCom[(item[0],item[1],item[2] )] = (item[3],item[4])\r
-        GlobalPcds = set([(item[0],item[1]) for item in StructurePcdInCom.keys()])\r
+        GlobalPcds = {(item[0],item[1]) for item in StructurePcdInCom}\r
         for Pcd in StruPcds.values():\r
             if (Pcd.TokenSpaceGuidCName,Pcd.TokenCName) not in GlobalPcds:\r
                 continue\r
@@ -1276,7 +1276,7 @@ class DscBuildData(PlatformBuildClassObject):
         DefaultStoreMgr = DefaultStore(self.DefaultStores)\r
         SkuIds = self.SkuIdMgr.AvailableSkuIdSet\r
         SkuIds.update({TAB_DEFAULT:0})\r
-        DefaultStores = set([storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])\r
+        DefaultStores = {storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict}\r
 \r
         S_PcdSet = []\r
         # Find out all possible PCD candidates for self._Arch\r
@@ -2332,7 +2332,7 @@ class DscBuildData(PlatformBuildClassObject):
         Pcds = {}\r
         DefaultStoreObj = DefaultStore(self._GetDefaultStores())\r
         SkuIds = {skuname:skuid for skuname,skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname != TAB_COMMON}\r
-        DefaultStores = set([storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])\r
+        DefaultStores = set([storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict])\r
         for PcdCName, TokenSpaceGuid in PcdSet:\r
             PcdObj = PcdSet[(PcdCName, TokenSpaceGuid)]\r
             self.CopyDscRawValue(PcdObj)\r