BaseTools: Fix old python2 idioms
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:
@@ -409,8 +409,7 @@ class DecPomAlignment(PackageObject):
|
||||
#
|
||||
PackagePath = os.path.split(self.GetFullPath())[0]
|
||||
IncludePathList = \
|
||||
[os.path.normpath(Path) + sep for Path in IncludesDict.keys()]
|
||||
IncludePathList.sort()
|
||||
sorted([os.path.normpath(Path) + sep for Path in IncludesDict.keys()])
|
||||
|
||||
#
|
||||
# get a non-overlap set of include path, IncludePathList should be
|
||||
|
@@ -611,8 +611,7 @@ class InfPomAlignment(ModuleObject):
|
||||
SourceFile = Item.GetSourceFileName()
|
||||
Family = Item.GetFamily()
|
||||
FeatureFlag = Item.GetFeatureFlagExp()
|
||||
SupArchList = ConvertArchList(Item.GetSupArchList())
|
||||
SupArchList.sort()
|
||||
SupArchList = sorted(ConvertArchList(Item.GetSupArchList()))
|
||||
Source = SourceFileObject()
|
||||
Source.SetSourceFile(SourceFile)
|
||||
Source.SetFamily(Family)
|
||||
|
@@ -194,8 +194,7 @@ def GenBinaryData(BinaryData, BinaryObj, BinariesDict, AsBuildIns, BinaryFileObj
|
||||
# can be used for the attribute.
|
||||
# If both not have VALID_ARCHITECTURE comment and no architecturie specified, then keep it empty.
|
||||
#
|
||||
SupArchList = ConvertArchList(ItemObj.GetSupArchList())
|
||||
SupArchList.sort()
|
||||
SupArchList = sorted(ConvertArchList(ItemObj.GetSupArchList()))
|
||||
if len(SupArchList) == 1 and SupArchList[0] == 'COMMON':
|
||||
if not (len(OriSupArchList) == 1 or OriSupArchList[0] == 'COMMON'):
|
||||
SupArchList = OriSupArchList
|
||||
|
Reference in New Issue
Block a user