diff options
Diffstat (limited to 'scripts/lib/recipetool')
| -rw-r--r-- | scripts/lib/recipetool/create.py | 2 | ||||
| -rw-r--r-- | scripts/lib/recipetool/create_buildsys_python.py | 6 |
2 files changed, 4 insertions, 4 deletions
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): | |||
| 167 | unmappedpc = [] | 167 | unmappedpc = [] |
| 168 | pcdeps = list(set(pcdeps)) | 168 | pcdeps = list(set(pcdeps)) |
| 169 | for pcdep in pcdeps: | 169 | for pcdep in pcdeps: |
| 170 | if isinstance(pcdep, basestring): | 170 | if isinstance(pcdep, str): |
| 171 | recipe = recipemap.get(pcdep, None) | 171 | recipe = recipemap.get(pcdep, None) |
| 172 | if recipe: | 172 | if recipe: |
| 173 | deps.append(recipe) | 173 | 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): | |||
| 245 | if field not in self.bbvar_map: | 245 | if field not in self.bbvar_map: |
| 246 | continue | 246 | continue |
| 247 | 247 | ||
| 248 | if isinstance(values, basestring): | 248 | if isinstance(values, str): |
| 249 | value = values | 249 | value = values |
| 250 | else: | 250 | else: |
| 251 | value = ' '.join(str(v) for v in values if v) | 251 | value = ' '.join(str(v) for v in values if v) |
| @@ -436,7 +436,7 @@ class PythonRecipeHandler(RecipeHandler): | |||
| 436 | return value | 436 | return value |
| 437 | 437 | ||
| 438 | value = info[variable] | 438 | value = info[variable] |
| 439 | if isinstance(value, basestring): | 439 | if isinstance(value, str): |
| 440 | new_value = replace_value(search, replace, value) | 440 | new_value = replace_value(search, replace, value) |
| 441 | if new_value is None: | 441 | if new_value is None: |
| 442 | del info[variable] | 442 | del info[variable] |
| @@ -706,7 +706,7 @@ class LiteralAstTransform(ast.NodeTransformer): | |||
| 706 | def has_non_literals(value): | 706 | def has_non_literals(value): |
| 707 | if isinstance(value, ast.AST): | 707 | if isinstance(value, ast.AST): |
| 708 | return True | 708 | return True |
| 709 | elif isinstance(value, basestring): | 709 | elif isinstance(value, str): |
| 710 | return False | 710 | return False |
| 711 | elif hasattr(value, 'values'): | 711 | elif hasattr(value, 'values'): |
| 712 | return any(has_non_literals(v) for v in value.values()) | 712 | return any(has_non_literals(v) for v in value.values()) |
