BaseTools: refactor and remove more keys() usage

this is no longer required to make dictionary objects iterable.

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/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index f50059551e2e6708c2a71903456be5c5c88b35d5..ccca971b0622e01d5221575a292dbcd7c2466054 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -594,7 +594,7 @@ class DscBuildData(PlatformBuildClassObject):
         #\r
         # If command line defined, should override the value in DSC file.\r
         #\r
         #\r
         # If command line defined, should override the value in DSC file.\r
         #\r

-        if 'FIX_LOAD_TOP_MEMORY_ADDRESS' in GlobalData.gCommandLineDefines.keys():\r
+        if 'FIX_LOAD_TOP_MEMORY_ADDRESS' in GlobalData.gCommandLineDefines:\r

             try:\r
                 self._LoadFixAddress = int(GlobalData.gCommandLineDefines['FIX_LOAD_TOP_MEMORY_ADDRESS'], 0)\r
             except:\r
             try:\r
                 self._LoadFixAddress = int(GlobalData.gCommandLineDefines['FIX_LOAD_TOP_MEMORY_ADDRESS'], 0)\r
             except:\r


@@ -682,9 +682,7 @@ class DscBuildData(PlatformBuildClassObject):
                 self.DefaultStores[Record[1].upper()] = (DscBuildData.ToInt(Record[0]),Record[1].upper())\r
             if TAB_DEFAULT_STORES_DEFAULT not in self.DefaultStores:\r
                 self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] = (0,TAB_DEFAULT_STORES_DEFAULT)\r
                 self.DefaultStores[Record[1].upper()] = (DscBuildData.ToInt(Record[0]),Record[1].upper())\r
             if TAB_DEFAULT_STORES_DEFAULT not in self.DefaultStores:\r
                 self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] = (0,TAB_DEFAULT_STORES_DEFAULT)\r

-            GlobalData.gDefaultStores = self.DefaultStores.keys()\r
-            if GlobalData.gDefaultStores:\r
-                GlobalData.gDefaultStores.sort()\r
+            GlobalData.gDefaultStores = sorted(self.DefaultStores.keys())\r

         return self.DefaultStores\r
 \r
     ## Retrieve [Components] section information\r
         return self.DefaultStores\r
 \r
     ## Retrieve [Components] section information\r


@@ -1423,11 +1421,11 @@ class DscBuildData(PlatformBuildClassObject):
 \r
             for pcdkey in Pcds:\r
                 pcd = Pcds[pcdkey]\r
 \r
             for pcdkey in Pcds:\r
                 pcd = Pcds[pcdkey]\r

-                if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+                if 'DEFAULT' not in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r

                     pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
                     pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r

-                    del(pcd.SkuInfoList['COMMON'])\r
-                elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
-                    del(pcd.SkuInfoList['COMMON'])\r
+                    del pcd.SkuInfoList['COMMON']\r
+                elif 'DEFAULT' in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r
+                    del pcd.SkuInfoList['COMMON']\r

 \r
         map(self.FilterSkuSettings,[Pcds[pcdkey] for pcdkey in Pcds if Pcds[pcdkey].Type in DynamicPcdType])\r
         return Pcds\r
 \r
         map(self.FilterSkuSettings,[Pcds[pcdkey] for pcdkey in Pcds if Pcds[pcdkey].Type in DynamicPcdType])\r
         return Pcds\r


@@ -1472,10 +1470,7 @@ class DscBuildData(PlatformBuildClassObject):
             else:\r
                 PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue, DatumType, MaxDatumSize)}\r
 \r
             else:\r
                 PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue, DatumType, MaxDatumSize)}\r
 \r

-        PcdsKeys = PcdValueDict.keys()\r
-        for PcdCName, TokenSpaceGuid in PcdsKeys:\r
-\r
-            PcdSetting = PcdValueDict[PcdCName, TokenSpaceGuid]\r
+        for ((PcdCName,TokenSpaceGuid),PcdSetting) in PcdValueDict.iteritems():\r

             PcdValue = None\r
             DatumType = None\r
             MaxDatumSize = None\r
             PcdValue = None\r
             DatumType = None\r
             MaxDatumSize = None\r


@@ -1872,7 +1867,7 @@ class DscBuildData(PlatformBuildClassObject):
         OverrideValues = {DefaultStore:""}\r
         if Pcd.SkuOverrideValues:\r
             OverrideValues = Pcd.SkuOverrideValues[SkuName]\r
         OverrideValues = {DefaultStore:""}\r
         if Pcd.SkuOverrideValues:\r
             OverrideValues = Pcd.SkuOverrideValues[SkuName]\r

-        for DefaultStoreName in OverrideValues.keys():\r
+        for DefaultStoreName in OverrideValues:\r

             CApp = CApp + 'void\n'\r
             CApp = CApp + 'Initialize_%s_%s_%s_%s(\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
             CApp = CApp + '  void\n'\r
             CApp = CApp + 'void\n'\r
             CApp = CApp + 'Initialize_%s_%s_%s_%s(\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
             CApp = CApp + '  void\n'\r


@@ -2251,7 +2246,7 @@ class DscBuildData(PlatformBuildClassObject):
 \r
             PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
             SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', '', PcdValue)\r
 \r
             PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
             SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', '', PcdValue)\r

-            if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
+            if (PcdCName, TokenSpaceGuid) in Pcds:\r

                 pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
                 pcdObject.SkuInfoList[SkuName] = SkuInfo\r
                 if MaxDatumSize.strip():\r
                 pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
                 pcdObject.SkuInfoList[SkuName] = SkuInfo\r
                 if MaxDatumSize.strip():\r


@@ -2284,15 +2279,15 @@ class DscBuildData(PlatformBuildClassObject):
             for sku in pcd.SkuInfoList.values():\r
                 if not sku.DefaultValue:\r
                     sku.DefaultValue = pcdDecObject.DefaultValue\r
             for sku in pcd.SkuInfoList.values():\r
                 if not sku.DefaultValue:\r
                     sku.DefaultValue = pcdDecObject.DefaultValue\r

-            if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+            if 'DEFAULT' not in pcd.SkuInfoList and 'COMMON' not in pcd.SkuInfoList:\r

                 valuefromDec = pcdDecObject.DefaultValue\r
                 SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', '', valuefromDec)\r
                 pcd.SkuInfoList['DEFAULT'] = SkuInfo\r
                 valuefromDec = pcdDecObject.DefaultValue\r
                 SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', '', valuefromDec)\r
                 pcd.SkuInfoList['DEFAULT'] = SkuInfo\r

-            elif 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+            elif 'DEFAULT' not in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r

                 pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
                 pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r

-                del(pcd.SkuInfoList['COMMON'])\r
-            elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
-                del(pcd.SkuInfoList['COMMON'])\r
+                del pcd.SkuInfoList['COMMON']\r
+            elif 'DEFAULT' in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r
+                del pcd.SkuInfoList['COMMON']\r

 \r
         map(self.FilterSkuSettings,Pcds.values())\r
 \r
 \r
         map(self.FilterSkuSettings,Pcds.values())\r
 \r


@@ -2301,7 +2296,7 @@ class DscBuildData(PlatformBuildClassObject):
     def FilterSkuSettings(self, PcdObj):\r
 \r
         if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:\r
     def FilterSkuSettings(self, PcdObj):\r
 \r
         if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:\r

-            if 'DEFAULT' in PcdObj.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in PcdObj.SkuInfoList.keys():\r
+            if 'DEFAULT' in PcdObj.SkuInfoList and self.SkuIdMgr.SystemSkuId not in PcdObj.SkuInfoList:\r

                 PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId] = PcdObj.SkuInfoList['DEFAULT']\r
             PcdObj.SkuInfoList = {'DEFAULT':PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId]}\r
             PcdObj.SkuInfoList['DEFAULT'].SkuIdName = 'DEFAULT'\r
                 PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId] = PcdObj.SkuInfoList['DEFAULT']\r
             PcdObj.SkuInfoList = {'DEFAULT':PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId]}\r
             PcdObj.SkuInfoList['DEFAULT'].SkuIdName = 'DEFAULT'\r


@@ -2456,7 +2451,7 @@ class DscBuildData(PlatformBuildClassObject):
                     EdkLogger.error('Build', PCD_VARIABLE_ATTRIBUTES_CONFLICT_ERROR, "The variable %s.%s for DynamicHii PCDs has conflicting attributes [%s] and [%s] " % (VariableGuid, VariableName, VarAttribute, VariableAttrs[(VariableName, VariableGuid)]))\r
 \r
             pcdDecObject = self._DecPcds[PcdCName, TokenSpaceGuid]\r
                     EdkLogger.error('Build', PCD_VARIABLE_ATTRIBUTES_CONFLICT_ERROR, "The variable %s.%s for DynamicHii PCDs has conflicting attributes [%s] and [%s] " % (VariableGuid, VariableName, VarAttribute, VariableAttrs[(VariableName, VariableGuid)]))\r
 \r
             pcdDecObject = self._DecPcds[PcdCName, TokenSpaceGuid]\r

-            if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
+            if (PcdCName, TokenSpaceGuid) in Pcds:\r

                 pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
                 if SkuName in pcdObject.SkuInfoList:\r
                     Skuitem = pcdObject.SkuInfoList[SkuName]\r
                 pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
                 if SkuName in pcdObject.SkuInfoList:\r
                     Skuitem = pcdObject.SkuInfoList[SkuName]\r


@@ -2494,15 +2489,15 @@ class DscBuildData(PlatformBuildClassObject):
                     for default_store in sku.DefaultStoreDict:\r
                         sku.DefaultStoreDict[default_store]=pcdDecObject.DefaultValue\r
                     pcd.DefaultValue = pcdDecObject.DefaultValue\r
                     for default_store in sku.DefaultStoreDict:\r
                         sku.DefaultStoreDict[default_store]=pcdDecObject.DefaultValue\r
                     pcd.DefaultValue = pcdDecObject.DefaultValue\r

-            if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+            if 'DEFAULT' not in pcd.SkuInfoList and 'COMMON' not in pcd.SkuInfoList:\r

                 valuefromDec = pcdDecObject.DefaultValue\r
                 SkuInfo = SkuInfoClass('DEFAULT', '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec,VariableAttribute=SkuInfoObj.VariableAttribute,DefaultStore={DefaultStore:valuefromDec})\r
                 pcd.SkuInfoList['DEFAULT'] = SkuInfo\r
                 valuefromDec = pcdDecObject.DefaultValue\r
                 SkuInfo = SkuInfoClass('DEFAULT', '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec,VariableAttribute=SkuInfoObj.VariableAttribute,DefaultStore={DefaultStore:valuefromDec})\r
                 pcd.SkuInfoList['DEFAULT'] = SkuInfo\r

-            elif 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+            elif 'DEFAULT' not in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r

                 pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
                 pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r

-                del(pcd.SkuInfoList['COMMON'])\r
-            elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
-                del(pcd.SkuInfoList['COMMON'])\r
+                del pcd.SkuInfoList['COMMON']\r
+            elif 'DEFAULT' in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r
+                del pcd.SkuInfoList['COMMON']\r

 \r
             if pcd.MaxDatumSize.strip():\r
                 MaxSize = int(pcd.MaxDatumSize, 0)\r
 \r
             if pcd.MaxDatumSize.strip():\r
                 MaxSize = int(pcd.MaxDatumSize, 0)\r


@@ -2584,7 +2579,7 @@ class DscBuildData(PlatformBuildClassObject):
             #\r
             VpdOffset, MaxDatumSize, InitialValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
             SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', VpdOffset, InitialValue)\r
             #\r
             VpdOffset, MaxDatumSize, InitialValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
             SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', VpdOffset, InitialValue)\r

-            if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
+            if (PcdCName, TokenSpaceGuid) in Pcds:\r

                 pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
                 pcdObject.SkuInfoList[SkuName] = SkuInfo\r
                 if MaxDatumSize.strip():\r
                 pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
                 pcdObject.SkuInfoList[SkuName] = SkuInfo\r
                 if MaxDatumSize.strip():\r


@@ -2618,15 +2613,15 @@ class DscBuildData(PlatformBuildClassObject):
             for sku in pcd.SkuInfoList.values():\r
                 if not sku.DefaultValue:\r
                     sku.DefaultValue = pcdDecObject.DefaultValue\r
             for sku in pcd.SkuInfoList.values():\r
                 if not sku.DefaultValue:\r
                     sku.DefaultValue = pcdDecObject.DefaultValue\r

-            if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+            if 'DEFAULT' not in pcd.SkuInfoList and 'COMMON' not in pcd.SkuInfoList:\r

                 valuefromDec = pcdDecObject.DefaultValue\r
                 SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', SkuInfoObj.VpdOffset, valuefromDec)\r
                 pcd.SkuInfoList['DEFAULT'] = SkuInfo\r
                 valuefromDec = pcdDecObject.DefaultValue\r
                 SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', SkuInfoObj.VpdOffset, valuefromDec)\r
                 pcd.SkuInfoList['DEFAULT'] = SkuInfo\r

-            elif 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+            elif 'DEFAULT' not in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r

                 pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
                 pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r

-                del(pcd.SkuInfoList['COMMON'])\r
-            elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
-                del(pcd.SkuInfoList['COMMON'])\r
+                del pcd.SkuInfoList['COMMON']\r
+            elif 'DEFAULT' in pcd.SkuInfoList and 'COMMON' in pcd.SkuInfoList:\r
+                del pcd.SkuInfoList['COMMON']\r

 \r
 \r
         map(self.FilterSkuSettings,Pcds.values())\r
 \r
 \r
         map(self.FilterSkuSettings,Pcds.values())\r