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:
@ -257,9 +257,9 @@ class SourceFiles:
|
||||
replaceables = ('extract-dir', 'filename', 'url')
|
||||
for replaceItem in fdata:
|
||||
if replaceItem in replaceables: continue
|
||||
if type(fdata[replaceItem]) != str: continue
|
||||
if not isinstance(fdata[replaceItem], str): continue
|
||||
for replaceable in replaceables:
|
||||
if type(fdata[replaceable]) != str: continue
|
||||
if not isinstance(fdata[replaceable], str): continue
|
||||
if replaceable in fdata:
|
||||
fdata[replaceable] = \
|
||||
fdata[replaceable].replace(
|
||||
|
Reference in New Issue
Block a user