diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/__init__.py | 2 | ||||
| -rw-r--r-- | scripts/lib/recipetool/create.py | 2 | ||||
| -rw-r--r-- | scripts/lib/recipetool/create_buildsys_python.py | 6 | ||||
| -rw-r--r-- | scripts/lib/scriptutils.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 506d95b0f7..6f5bb8dba0 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -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( diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 5a37d18209..e3e01e385a 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -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) diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py index cc3b5a45fd..5cbea2abba 100644 --- a/scripts/lib/recipetool/create_buildsys_python.py +++ b/scripts/lib/recipetool/create_buildsys_python.py @@ -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()) diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py index aef19d3d73..bd082d8581 100644 --- a/scripts/lib/scriptutils.py +++ b/scripts/lib/scriptutils.py @@ -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 = '' |