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>

4 files changed, 8 insertions, 8 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index bf84e6c..75b4e22 100644
--- 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

             ImageEntryPoint = "_ModuleEntryPoint"

 

-        for k, v in MyAgo.Module.Defines.iteritems():

+        for k, v in MyAgo.Module.Defines.items():

             if k not in MyAgo.Macros:

                 MyAgo.Macros[k] = v

 

@@ -503,7 +503,7 @@ cleanlib:
             MyAgo.Macros['IMAGE_ENTRY_POINT'] = ImageEntryPoint

 

         PCI_COMPRESS_Flag = False

-        for k, v in MyAgo.Module.Defines.iteritems():

+        for k, v in MyAgo.Module.Defines.items():

             if 'PCI_COMPRESS' == k and 'TRUE' == v:

                 PCI_COMPRESS_Flag = True

 

@@ -654,7 +654,7 @@ cleanlib:
             "module_relative_directory" : MyAgo.SourceDir,

             "module_dir"                : mws.join (self.Macros["WORKSPACE"], MyAgo.SourceDir),

             "package_relative_directory": package_rel_dir,

-            "module_extra_defines"      : ["%s = %s" % (k, v) for k, v in MyAgo.Module.Defines.iteritems()],

+            "module_extra_defines"      : ["%s = %s" % (k, v) for k, v in MyAgo.Module.Defines.items()],

 

             "architecture"              : MyAgo.Arch,

             "toolchain_tag"             : MyAgo.ToolChain,

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 40c0105..b91f06b 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1019,11 +1019,11 @@ class sdict(IterableUserDict):
 

     ## Keys interation support

     def iterkeys(self):

-        return iter(self.keys())

+        return self.keys()

 

     ## Values interation support

     def itervalues(self):

-        return iter(self.values())

+        return self.values()

 

     ## Return value related to a key, and remove the (key, value) from the dict

     def pop(self, key, *dv):

@@ -1032,7 +1032,7 @@ class sdict(IterableUserDict):
             value = self[key]

             self.__delitem__(key)

         elif len(dv) != 0 :

-            value = kv[0]

+            value = dv[0]

         return value

 

     ## Return (key, value) pair, and remove the (key, value) from the dict

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 8d1535e..26d2c16 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1594,7 +1594,7 @@ class DscBuildData(PlatformBuildClassObject):
             else:

                 PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue, DatumType, MaxDatumSize)}

 

-        for ((PcdCName, TokenSpaceGuid), PcdSetting) in PcdValueDict.iteritems():

+        for ((PcdCName, TokenSpaceGuid), PcdSetting) in PcdValueDict.items():

             if self.SkuIdMgr.SystemSkuId in PcdSetting:

                 PcdValue, DatumType, MaxDatumSize = PcdSetting[self.SkuIdMgr.SystemSkuId]

             elif TAB_DEFAULT in PcdSetting:

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 314eda7..7715cfa 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2178,7 +2178,7 @@ class Build():
 

                     # Look through the tool definitions for GUIDed tools

                     guidAttribs = []

-                    for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.iteritems():

+                    for (attrib, value) in self.ToolDef.ToolsDefTxtDictionary.items():

                         if attrib.upper().endswith('_GUID'):

                             split = attrib.split('_')

                             thisPrefix = '_'.join(split[0:3]) + '_'