sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Remove the deprecated hash_key()

Browse Source 
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>
This commit is contained in:
Gary Lin
2018-06-25 18:31:29 +08:00
committed by Yonghong Zhu
parent 890d8ede68
commit 27c4ceb41c
18 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/basemodel/ini.py
View File

@ -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)

6
BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/baseobject.py
View File

@ -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)

8
BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/inf.py
View File

@ -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: