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

BaseTools: Fix old python2 idioms

Browse Source 
Based on "futurize -f lib2to3.fixes.fix_idioms"

* Change some type comparisons to isinstance() calls:
    type(x) == T -> isinstance(x, T)
    type(x) is T -> isinstance(x, T)
    type(x) != T -> not isinstance(x, T)
    type(x) is not T -> not isinstance(x, T)

* Change "while 1:" into "while True:".

* Change both

    v = list(EXPR)
    v.sort()
    foo(v)

and the more general

    v = EXPR
    v.sort()
    foo(v)

into

    v = sorted(EXPR)
    foo(v)

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:35 +08:00
committed by Yonghong Zhu
parent 2617a73c36
commit 0d1f5b2b5d
31 changed files with 93 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Source/Python/UPT/Library/Misc.py
View File

@@ -514,7 +514,7 @@ class PathClass(object):
# Check whether PathClass are the same
#
def __eq__(self, Other):
if type(Other) == type(self):
if isinstance(Other, type(self)):
return self.Path == Other.Path
else:
return self.Path == str(Other)
@@ -819,11 +819,11 @@ def ConvertArchList(ArchList):
if not ArchList:
return NewArchList
if type(ArchList) == list:
if isinstance(ArchList, list):
for Arch in ArchList:
Arch = Arch.upper()
NewArchList.append(Arch)
elif type(ArchList) == str:
elif isinstance(ArchList, str):
ArchList = ArchList.upper()
NewArchList.append(ArchList)

2
BaseTools/Source/Python/UPT/Library/ParserValidate.py
View File

@@ -341,7 +341,7 @@ def IsValidCFormatGuid(Guid):
#
# Index may out of bound
#
if type(List[Index]) != type(1) or \
if not isinstance(List[Index], type(1)) or \
len(Value) > List[Index] or len(Value) < 3:
return False

2
BaseTools/Source/Python/UPT/Library/StringUtils.py
View File

@@ -651,7 +651,7 @@ def ConvertToSqlString2(String):
# @param Split: split character
#
def GetStringOfList(List, Split=' '):
if type(List) != type([]):
if not isinstance(List, type([])):
return List
Str = ''
for Item in List:

2
BaseTools/Source/Python/UPT/Library/Xml/XmlRoutines.py
View File

@@ -40,7 +40,7 @@ def CreateXmlElement(Name, String, NodeList, AttributeList):
Element.appendChild(Doc.createTextNode(String))
for Item in NodeList:
if type(Item) == type([]):
if isinstance(Item, type([])):
Key = Item[0]
Value = Item[1]
if Key != '' and Key is not None and Value != '' and Value is not None: