BaseTools: replace the list iteritems by items

replace the list iteritems by items in Python3.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index bf84e6c63fbc6564a0d2688c638c62f4a77fd56d..75b4e2247af565318ee409f307f48b8c07d68c67 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -491,7 +491,7 @@ cleanlib:
             # EdkII modules always use "_ModuleEntryPoint" as entry point\r
             ImageEntryPoint = "_ModuleEntryPoint"\r
 \r
-        for k, v in MyAgo.Module.Defines.iteritems():\r
+        for k, v in MyAgo.Module.Defines.items():\r
             if k not in MyAgo.Macros:\r
                 MyAgo.Macros[k] = v\r
 \r
@@ -503,7 +503,7 @@ cleanlib:
             MyAgo.Macros['IMAGE_ENTRY_POINT'] = ImageEntryPoint\r
 \r
         PCI_COMPRESS_Flag = False\r
-        for k, v in MyAgo.Module.Defines.iteritems():\r
+        for k, v in MyAgo.Module.Defines.items():\r
             if 'PCI_COMPRESS' == k and 'TRUE' == v:\r
                 PCI_COMPRESS_Flag = True\r
 \r
@@ -654,7 +654,7 @@ cleanlib:
             "module_relative_directory" : MyAgo.SourceDir,\r
             "module_dir"                : mws.join (self.Macros["WORKSPACE"], MyAgo.SourceDir),\r
             "package_relative_directory": package_rel_dir,\r
-            "module_extra_defines"      : ["%s = %s" % (k, v) for k, v in MyAgo.Module.Defines.iteritems()],\r
+            "module_extra_defines"      : ["%s = %s" % (k, v) for k, v in MyAgo.Module.Defines.items()],\r
 \r
             "architecture"              : MyAgo.Arch,\r
             "toolchain_tag"             : MyAgo.ToolChain,\r

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 40c0105a3c4c92510c63d230510677bc5ae50921..b91f06b19e96e137e243e81e979d040aef19daf6 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1019,11 +1019,11 @@ class sdict(IterableUserDict):
 \r
     ## Keys interation support\r
     def iterkeys(self):\r
-        return iter(self.keys())\r
+        return self.keys()\r
 \r
     ## Values interation support\r
     def itervalues(self):\r
-        return iter(self.values())\r
+        return self.values()\r
 \r
     ## Return value related to a key, and remove the (key, value) from the dict\r
     def pop(self, key, *dv):\r
@@ -1032,7 +1032,7 @@ class sdict(IterableUserDict):
             value = self[key]\r
             self.__delitem__(key)\r
         elif len(dv) != 0 :\r
-            value = kv[0]\r
+            value = dv[0]\r
         return value\r
 \r
     ## Return (key, value) pair, and remove the (key, value) from the dict\r

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 8d1535e6e3f49a156a9ecbe0f9c94d9228998133..26d2c166fa2e0668b248461050349472e6a65cfd 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1594,7 +1594,7 @@ class DscBuildData(PlatformBuildClassObject):
             else:\r
                 PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue, DatumType, MaxDatumSize)}\r
 \r
-        for ((PcdCName, TokenSpaceGuid), PcdSetting) in PcdValueDict.iteritems():\r
+        for ((PcdCName, TokenSpaceGuid), PcdSetting) in PcdValueDict.items():\r
             if self.SkuIdMgr.SystemSkuId in PcdSetting:\r
                 PcdValue, DatumType, MaxDatumSize = PcdSetting[self.SkuIdMgr.SystemSkuId]\r
             elif TAB_DEFAULT in PcdSetting:\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 314eda78709a8bc6cab5797f24caba9f18131028..7715cfa52abecf3f0ede75739f1923883eac141e 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2178,7 +2178,7 @@ class Build():
 \r
                     # Look through the tool definitions for GUIDed tools\r
                     guidAttribs = []\r
-                    for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.iteritems():\r
+                    for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.items():\r
                         if attrib.upper().endswith('_GUID'):\r
                             split = attrib.split('_')\r
                             thisPrefix = '_'.join(split[0:3]) + '_'\r