BaseTools: Remove the deprecated hash_key()

Replace "has_key()" with "in" to be compatible with python3.
Based on "futurize -f lib2to3.fixes.fix_has_key"

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

18 files changed, 39 insertions, 40 deletions

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
index ea83327052..ccfef6b6e2 100644
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
@@ -140,7 +140,7 @@ class BaseINIFile(object):
                     sObj = self.GetSectionInstance(self, name, (len(sname_arr) > 1))

                     sObj._start = index

                     sObjs.append(sObj)

-                    if not self._sections.has_key(name.lower()):

+                    if name.lower() not in self._sections:

                         self._sections[name.lower()] = [sObj]

                     else:

                         self._sections[name.lower()].append(sObj)

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
index 7c120d85c2..b49c87c8bd 100644
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
@@ -26,7 +26,7 @@ class SurfaceObject(object):
 

         """

         obj = object.__new__(cls, *args, **kwargs)

-        if not cls._objs.has_key("None"):

+        if "None" not in cls._objs:

             cls._objs["None"] = []

         cls._objs["None"].append(obj)

 

@@ -47,7 +47,7 @@ class SurfaceObject(object):
         self.GetFileObj().Destroy(self)

         del self._fileObj

         # dereference self from _objs arrary

-        assert self._objs.has_key(key), "when destory, object is not in obj list"

+        assert key in self._objs, "when destory, object is not in obj list"

         assert self in self._objs[key], "when destory, object is not in obj list"

         self._objs[key].remove(self)

         if len(self._objs[key]) == 0:

@@ -95,7 +95,7 @@ class SurfaceObject(object):
         if self not in cls._objs["None"]:

             ErrorMsg("Sufrace object does not be create into None list")

         cls._objs["None"].remove(self)

-        if not cls._objs.has_key(relativePath):

+        if relativePath not in cls._objs:

             cls._objs[relativePath] = []

         cls._objs[relativePath].append(self)

 

diff --git a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
index 32b26850e7..793e95efed 100644
--- a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
+++ b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
@@ -61,7 +61,7 @@ class INFFile(ini.BaseINIFile):
         classname = self.GetProduceLibraryClass()

         if classname is not None:

             libobjdict = INFFile._libobjs

-            if libobjdict.has_key(classname):

+            if classname in libobjdict:

                 if self not in libobjdict[classname]:

                     libobjdict[classname].append(self)

             else:

@@ -169,7 +169,7 @@ class INFLibraryClassObject(INFSectionObject):
     def Parse(self):

         self._classname = self.GetLineByOffset(self._start).split('#')[0].strip()

         objdict = INFLibraryClassObject._objs

-        if objdict.has_key(self._classname):

+        if self._classname in objdict:

             objdict[self._classname].append(self)

         else:

             objdict[self._classname] = [self]

@@ -241,7 +241,7 @@ class INFSourceObject(INFSectionObject):
 

         self.mFilename = os.path.basename(self.GetSourceFullPath())

         objdict = INFSourceObject._objs

-        if not objdict.has_key(self.mFilename):

+        if self.mFilename not in objdict:

             objdict[self.mFilename] = [self]

         else:

             objdict[self.mFilename].append(self)

@@ -303,7 +303,7 @@ class INFPcdObject(INFSectionObject):
             self.mDefaultValue = arr[1].strip()

 

         objdict = INFPcdObject._objs

-        if objdict.has_key(self.GetName()):

+        if self.GetName() in objdict:

             if self not in objdict[self.GetName()]:

                 objdict[self.GetName()].append(self)

         else:

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index d748590941..dbcf662389 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1798,8 +1798,8 @@ class PlatformAutoGen(AutoGen):
             # retrieve BPDG tool's path from tool_def.txt according to VPD_TOOL_GUID defined in DSC file.

             BPDGToolName = None

             for ToolDef in self.ToolDefinition.values():

-                if ToolDef.has_key(TAB_GUID) and ToolDef[TAB_GUID] == self.Platform.VpdToolGuid:

-                    if not ToolDef.has_key("PATH"):

+                if TAB_GUID in ToolDef and ToolDef[TAB_GUID] == self.Platform.VpdToolGuid:

+                    if "PATH" not in ToolDef:

                         EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "PATH attribute was not provided for BPDG guid tool %s in tools_def.txt" % self.Platform.VpdToolGuid)

                     BPDGToolName = ToolDef["PATH"]

                     break

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 435b23f203..ddabe9fb25 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -211,7 +211,7 @@ class VpdInfoFile:
     #

     #  @param vpd    A given VPD PCD 

     def GetOffset(self, vpd):

-        if not self._VpdArray.has_key(vpd):

+        if vpd not in self._VpdArray:

             return None

         

         if len(self._VpdArray[vpd]) == 0:

diff --git a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
index bfd422b196..b97b319e09 100644
--- a/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
+++ b/BaseTools/Source/Python/UPT/GenMetaFile/GenInfFile.py
@@ -438,14 +438,14 @@ def GenLibraryClasses(ModuleObject):
                 Statement = '# Guid: ' + LibraryItem.Guid + ' Version: ' + LibraryItem.Version

 

                 if len(BinaryFile.SupArchList) == 0:

-                    if LibraryClassDict.has_key('COMMON') and Statement not in LibraryClassDict['COMMON']:

+                    if 'COMMON' in LibraryClassDict and Statement not in LibraryClassDict['COMMON']:

                         LibraryClassDict['COMMON'].append(Statement)

                     else:

                         LibraryClassDict['COMMON'] = ['## @LIB_INSTANCES']

                         LibraryClassDict['COMMON'].append(Statement)

                 else:

                     for Arch in BinaryFile.SupArchList:

-                        if LibraryClassDict.has_key(Arch):

+                        if Arch in LibraryClassDict:

                             if Statement not in LibraryClassDict[Arch]:

                                 LibraryClassDict[Arch].append(Statement)

                             else:

@@ -917,14 +917,14 @@ def GenAsBuiltPacthPcdSections(ModuleObject):
             if FileNameObjList:

                 ArchList = FileNameObjList[0].GetSupArchList()

             if len(ArchList) == 0:

-                if PatchPcdDict.has_key(DT.TAB_ARCH_COMMON):

+                if DT.TAB_ARCH_COMMON in PatchPcdDict:

                     if Statement not in PatchPcdDict[DT.TAB_ARCH_COMMON]:

                         PatchPcdDict[DT.TAB_ARCH_COMMON].append(Statement)

                 else:

                     PatchPcdDict[DT.TAB_ARCH_COMMON] = [Statement]

             else:

                 for Arch in ArchList:

-                    if PatchPcdDict.has_key(Arch):

+                    if Arch in PatchPcdDict:

                         if Statement not in PatchPcdDict[Arch]:

                             PatchPcdDict[Arch].append(Statement)

                     else:

@@ -967,13 +967,13 @@ def GenAsBuiltPcdExSections(ModuleObject):
                 ArchList = FileNameObjList[0].GetSupArchList()

 

             if len(ArchList) == 0:

-                if PcdExDict.has_key('COMMON'):

+                if 'COMMON' in PcdExDict:

                     PcdExDict['COMMON'].append(Statement)

                 else:

                     PcdExDict['COMMON'] = [Statement]

             else:

                 for Arch in ArchList:

-                    if PcdExDict.has_key(Arch):

+                    if Arch in PcdExDict:

                         if Statement not in PcdExDict[Arch]:

                             PcdExDict[Arch].append(Statement)

                     else:

@@ -1071,7 +1071,7 @@ def GenBuildOptions(ModuleObject):
             for BuilOptionItem in BinaryFile.AsBuiltList[0].BinaryBuildFlagList:

                 Statement = '#' + BuilOptionItem.AsBuiltOptionFlags

                 if len(BinaryFile.SupArchList) == 0:

-                    if BuildOptionDict.has_key('COMMON'):

+                    if 'COMMON' in BuildOptionDict:

                         if Statement not in BuildOptionDict['COMMON']:

                             BuildOptionDict['COMMON'].append(Statement)

                     else:

@@ -1079,7 +1079,7 @@ def GenBuildOptions(ModuleObject):
                         BuildOptionDict['COMMON'].append(Statement)

                 else:

                     for Arch in BinaryFile.SupArchList:

-                        if BuildOptionDict.has_key(Arch):

+                        if Arch in BuildOptionDict:

                             if Statement not in BuildOptionDict[Arch]:

                                 BuildOptionDict[Arch].append(Statement)

                         else:

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py
index 33b142d64e..cc2fc49053 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfBinaryObject.py
@@ -272,7 +272,7 @@ class InfBinariesObject(InfSectionCommonDef):
                                 pass

 

             if InfBianryVerItemObj is not None:

-                if self.Binaries.has_key((InfBianryVerItemObj)):

+                if (InfBianryVerItemObj) in self.Binaries:

                     BinariesList = self.Binaries[InfBianryVerItemObj]

                     BinariesList.append((InfBianryVerItemObj, VerComment))

                     self.Binaries[InfBianryVerItemObj] = BinariesList

@@ -522,7 +522,7 @@ class InfBinariesObject(InfSectionCommonDef):
 #                                pass

 

             if InfBianryCommonItemObj is not None:

-                if self.Binaries.has_key((InfBianryCommonItemObj)):

+                if (InfBianryCommonItemObj) in self.Binaries:

                     BinariesList = self.Binaries[InfBianryCommonItemObj]

                     BinariesList.append((InfBianryCommonItemObj, ItemComment))

                     self.Binaries[InfBianryCommonItemObj] = BinariesList

@@ -673,7 +673,7 @@ class InfBinariesObject(InfSectionCommonDef):
 #                                        pass

 

                     if InfBianryUiItemObj is not None:

-                        if self.Binaries.has_key((InfBianryUiItemObj)):

+                        if (InfBianryUiItemObj) in self.Binaries:

                             BinariesList = self.Binaries[InfBianryUiItemObj]

                             BinariesList.append((InfBianryUiItemObj, UiComment))

                             self.Binaries[InfBianryUiItemObj] = BinariesList

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
index 3995546593..9d27a92cd6 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfDefineObject.py
@@ -957,7 +957,7 @@ class InfDefObject(InfSectionCommonDef):
                     SpecValue = Name[Name.find("SPEC") + len("SPEC"):].strip()

                     Name = "SPEC"

                     Value = SpecValue + " = " + Value

-                if self.Defines.has_key(ArchListString):

+                if ArchListString in self.Defines:

                     DefineList = self.Defines[ArchListString]                 

                     LineInfo[0] = InfDefMemberObj.CurrentLine.GetFileName()

                     LineInfo[1] = InfDefMemberObj.CurrentLine.GetLineNo()

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
index fb8d1f5a62..4dfe75a2f1 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
@@ -338,7 +338,7 @@ class InfGuidObject():
                                 #

                                 pass

                                                 

-            if self.Guids.has_key((InfGuidItemObj)):           

+            if (InfGuidItemObj) in self.Guids:

                 GuidList = self.Guids[InfGuidItemObj]                 

                 GuidList.append(InfGuidItemObj)

                 self.Guids[InfGuidItemObj] = GuidList

@@ -350,4 +350,4 @@ class InfGuidObject():
         return True

     

     def GetGuid(self):

-        return self.Guids
\ No newline at end of file
+        return self.Guids

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py
index e588c6ba66..5de1832b71 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfLibraryClassesObject.py
@@ -238,7 +238,7 @@ class InfLibraryClassObject():
                 LibItemObj.SetVersion(LibItem[1])

                 LibItemObj.SetSupArchList(__SupArchList)

 

-            if self.LibraryClasses.has_key((LibItemObj)):

+            if (LibItemObj) in self.LibraryClasses:

                 LibraryList = self.LibraryClasses[LibItemObj]

                 LibraryList.append(LibItemObj)

                 self.LibraryClasses[LibItemObj] = LibraryList

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py b/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py
index 37f8cb2336..4ed739d66f 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfMisc.py
@@ -114,7 +114,7 @@ class InfSpecialCommentObject(InfSectionCommonDef):
            Type == DT.TYPE_EVENT_SECTION or \

            Type == DT.TYPE_BOOTMODE_SECTION:

             for Item in SepcialSectionList:

-                if self.SpecialComments.has_key(Type):           

+                if Type in self.SpecialComments:

                     ObjList = self.SpecialComments[Type]

                     ObjList.append(Item)

                     self.SpecialComments[Type] = ObjList

@@ -145,4 +145,4 @@ def ErrorInInf(Message=None, ErrorCode=None, LineInfo=None, RaiseError=True):
                  File=LineInfo[0], 

                  Line=LineInfo[1],

                  ExtraData=LineInfo[2], 

-                 RaiseError=RaiseError)
\ No newline at end of file
+                 RaiseError=RaiseError)

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py
index 01c854a847..bfac2b6b57 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPackagesObject.py
@@ -171,7 +171,7 @@ class InfPackageObject():
                                 #

                                 pass

                                             

-            if self.Packages.has_key((PackageItemObj)):   

+            if (PackageItemObj) in self.Packages:

                 PackageList = self.Packages[PackageItemObj]

                 PackageList.append(PackageItemObj)

                 self.Packages[PackageItemObj] = PackageList

@@ -184,4 +184,4 @@ class InfPackageObject():
     

     def GetPackages(self, Arch = None):

         if Arch is None:

-            return self.Packages
\ No newline at end of file
+            return self.Packages

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
index 62c1e8409a..3b9dfaed0c 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPcdObject.py
@@ -411,7 +411,7 @@ class InfPcdObject():
                 else:

                     PcdItemObj.SetSupportArchList(SupArchList)

 

-                if self.Pcds.has_key((PcdTypeItem, PcdItemObj)):

+                if (PcdTypeItem, PcdItemObj) in self.Pcds:

                     PcdsList = self.Pcds[PcdTypeItem, PcdItemObj]

                     PcdsList.append(PcdItemObj)

                     self.Pcds[PcdTypeItem, PcdItemObj] = PcdsList

@@ -456,7 +456,7 @@ class InfPcdObject():
                                                       PackageInfo)

 

             PcdTypeItem = KeysList[0][0]

-            if self.Pcds.has_key((PcdTypeItem, PcdItemObj)):

+            if (PcdTypeItem, PcdItemObj) in self.Pcds:

                 PcdsList = self.Pcds[PcdTypeItem, PcdItemObj]

                 PcdsList.append(PcdItemObj)

                 self.Pcds[PcdTypeItem, PcdItemObj] = PcdsList

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py
index eb6b692714..0f865c5696 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfPpiObject.py
@@ -327,7 +327,7 @@ class InfPpiObject():
                                 # 

                                 pass

             

-            if self.Ppis.has_key((InfPpiItemObj)):           

+            if (InfPpiItemObj) in self.Ppis:

                 PpiList = self.Ppis[InfPpiItemObj]

                 PpiList.append(InfPpiItemObj)

                 self.Ppis[InfPpiItemObj] = PpiList

@@ -340,4 +340,4 @@ class InfPpiObject():
         

     

     def GetPpi(self):

-        return self.Ppis
\ No newline at end of file
+        return self.Ppis

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py
index eb03095d6f..6cadeb5a21 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfProtocolObject.py
@@ -296,7 +296,7 @@ class InfProtocolObject():
                                 #

                                 pass      

                                       

-            if self.Protocols.has_key((InfProtocolItemObj)):           

+            if (InfProtocolItemObj) in self.Protocols:

                 ProcotolList = self.Protocols[InfProtocolItemObj]

                 ProcotolList.append(InfProtocolItemObj)

                 self.Protocols[InfProtocolItemObj] = ProcotolList

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py
index 2302dd5b96..285e89aacb 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfSoucesObject.py
@@ -224,7 +224,7 @@ class InfSourcesObject(InfSectionCommonDef):
                 

             ItemObj.SetSupArchList(__SupArchList) 

                                                                                                       

-            if self.Sources.has_key((ItemObj)):           

+            if (ItemObj) in self.Sources:

                 SourceContent = self.Sources[ItemObj]

                 SourceContent.append(ItemObj)

                 self.Sources[ItemObj] = SourceContent

@@ -237,4 +237,3 @@ class InfSourcesObject(InfSectionCommonDef):
      

     def GetSources(self):

         return self.Sources

-    
\ No newline at end of file
diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py
index 27a1c6ad25..f9db2944a4 100644
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfUserExtensionObject.py
@@ -103,7 +103,7 @@ class InfUserExtensionObject():
 #                            Line=LineNo,

 #                            ExtraData=None)

             

-            if self.UserExtension.has_key(IdContentItem):           

+            if IdContentItem in self.UserExtension:

                 #

                 # Each UserExtensions section header must have a unique set 

                 # of UserId, IdString and Arch values.

@@ -130,4 +130,4 @@ class InfUserExtensionObject():
         return True

         

     def GetUserExtension(self):

-        return self.UserExtension
\ No newline at end of file
+        return self.UserExtension

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 416aa73549..344b006bc4 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -77,7 +77,7 @@ TmpTableDict = {}
 #   Otherwise, False is returned

 #

 def IsToolInPath(tool):

-    if os.environ.has_key('PATHEXT'):

+    if 'PATHEXT' in os.environ:

         extns = os.environ['PATHEXT'].split(os.path.pathsep)

     else:

         extns = ('',)