diff options
| author | Carsey, Jaben <jaben.carsey@intel.com> | 2018-04-17 22:40:15 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-04-18 22:15:36 +0800 |
| commit | 9eb87141eca12b1f15afa4b769af04d1395891c6 (patch) | |
| tree | 82ac481092b68ea3684f94bf7dc90c3c584aea52 /BaseTools/Source/Python/GenFds/Fv.py | |
| parent | 55c84777ee638be8735a5c421941e7eb71633bdf (diff) | |
| download | edk2-9eb87141eca12b1f15afa4b769af04d1395891c6.tar.gz edk2-9eb87141eca12b1f15afa4b769af04d1395891c6.tar.bz2 edk2-9eb87141eca12b1f15afa4b769af04d1395891c6.zip | |
BaseTools: refactor and 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>
Diffstat (limited to 'BaseTools/Source/Python/GenFds/Fv.py')
| -rw-r--r-- | BaseTools/Source/Python/GenFds/Fv.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py index aae644bef9..5228e15526 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -70,7 +70,7 @@ class FV (FvClassObject): #
def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False) :
- if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFds.ImageBinDict.keys():
+ if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFds.ImageBinDict:
return GenFds.ImageBinDict[self.UiFvName.upper() + 'fv']
#
@@ -78,14 +78,13 @@ class FV (FvClassObject): # If yes, return error. Doesn't support FV in Capsule image is also in FD flash region.
#
if self.CapsuleName is not None:
- for FdName in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():
- FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[FdName]
+ for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():
for RegionObj in FdObj.RegionList:
if RegionObj.RegionType == 'FV':
for RegionData in RegionObj.RegionDataList:
if RegionData.endswith(".fv"):
continue
- elif RegionData.upper() + 'fv' in GenFds.ImageBinDict.keys():
+ elif RegionData.upper() + 'fv' in GenFds.ImageBinDict:
continue
elif self.UiFvName.upper() == RegionData.upper():
GenFdsGlobalVariable.ErrorLogger("Capsule %s in FD region can't contain a FV %s in FD region." % (self.CapsuleName, self.UiFvName.upper()))
@@ -235,8 +234,7 @@ class FV (FvClassObject): if self.BlockSizeList:
return True
- for FdName in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():
- FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[FdName]
+ for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():
for RegionObj in FdObj.RegionList:
if RegionObj.RegionType != 'FV':
continue
@@ -441,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.keys():
+ if VtfDict is not None and self.UiFvName in VtfDict:
self.FvInfFile.writelines("EFI_FILE_NAME = " + \
- VtfDict.get(self.UiFvName) + \
+ VtfDict[self.UiFvName] + \
T_CHAR_LF)
|