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>

1 files changed, 2 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 462e8f93f8..9a3415ccaa 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -151,7 +151,7 @@ def ReplaceExprMacro(String, Macros, ExceptionList = None):
             InQuote = True

         MacroStartPos = String.find('$(')

         if MacroStartPos < 0:

-            for Pcd in gPlatformPcds.keys():

+            for Pcd in gPlatformPcds:

                 if Pcd in String:

                     if Pcd not in gConditionalPcds:

                         gConditionalPcds.append(Pcd)

@@ -908,7 +908,7 @@ class ValueExpressionEx(ValueExpression):
                                 for Label in LabelList:

                                     if not IsValidCName(Label):

                                         raise BadExpression('%s is not a valid c variable name' % Label)

-                                    if Label not in LabelDict.keys():

+                                    if Label not in LabelDict:

                                         LabelDict[Label] = str(LabelOffset)

                             if Item.startswith('UINT8'):

                                 LabelOffset = LabelOffset + 1