scripts: Replace basestring -> str for python3
Python 3 doesn't have basestring type as all string are unicode strings. (From OE-Core rev: e8cfab060f4ff3c4c16387871354d407910e87aa) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
7eab022d4b
commit
ed7abe6b9a
|
@ -8,7 +8,7 @@ import subprocess
|
|||
|
||||
def exec_watch(cmd, **options):
|
||||
"""Run program with stdout shown on sys.stdout"""
|
||||
if isinstance(cmd, basestring) and not "shell" in options:
|
||||
if isinstance(cmd, str) and not "shell" in options:
|
||||
options["shell"] = True
|
||||
|
||||
process = subprocess.Popen(
|
||||
|
|
|
@ -59,7 +59,7 @@ def exec_build_env_command(init_path, builddir, cmd, watch=False, **options):
|
|||
def exec_watch(cmd, **options):
|
||||
"""Run program with stdout shown on sys.stdout"""
|
||||
import bb
|
||||
if isinstance(cmd, basestring) and not "shell" in options:
|
||||
if isinstance(cmd, str) and not "shell" in options:
|
||||
options["shell"] = True
|
||||
|
||||
process = subprocess.Popen(
|
||||
|
|
|
@ -167,7 +167,7 @@ class RecipeHandler(object):
|
|||
unmappedpc = []
|
||||
pcdeps = list(set(pcdeps))
|
||||
for pcdep in pcdeps:
|
||||
if isinstance(pcdep, basestring):
|
||||
if isinstance(pcdep, str):
|
||||
recipe = recipemap.get(pcdep, None)
|
||||
if recipe:
|
||||
deps.append(recipe)
|
||||
|
|
|
@ -245,7 +245,7 @@ class PythonRecipeHandler(RecipeHandler):
|
|||
if field not in self.bbvar_map:
|
||||
continue
|
||||
|
||||
if isinstance(values, basestring):
|
||||
if isinstance(values, str):
|
||||
value = values
|
||||
else:
|
||||
value = ' '.join(str(v) for v in values if v)
|
||||
|
@ -436,7 +436,7 @@ class PythonRecipeHandler(RecipeHandler):
|
|||
return value
|
||||
|
||||
value = info[variable]
|
||||
if isinstance(value, basestring):
|
||||
if isinstance(value, str):
|
||||
new_value = replace_value(search, replace, value)
|
||||
if new_value is None:
|
||||
del info[variable]
|
||||
|
@ -706,7 +706,7 @@ class LiteralAstTransform(ast.NodeTransformer):
|
|||
def has_non_literals(value):
|
||||
if isinstance(value, ast.AST):
|
||||
return True
|
||||
elif isinstance(value, basestring):
|
||||
elif isinstance(value, str):
|
||||
return False
|
||||
elif hasattr(value, 'values'):
|
||||
return any(has_non_literals(v) for v in value.values())
|
||||
|
|
|
@ -103,7 +103,7 @@ def fetch_uri(d, uri, destdir, srcrev=None):
|
|||
return ret
|
||||
|
||||
def run_editor(fn):
|
||||
if isinstance(fn, basestring):
|
||||
if isinstance(fn, str):
|
||||
params = '"%s"' % fn
|
||||
else:
|
||||
params = ''
|
||||
|
|
Loading…
Reference in New Issue