diff options
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 4eabe5f2a1..02d682d88f 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | import bb, re, string | 24 | import bb, re, string |
25 | from bb import methodpool | 25 | from bb import methodpool |
26 | from itertools import chain | 26 | import itertools |
27 | 27 | ||
28 | __word__ = re.compile(r"\S+") | 28 | __word__ = re.compile(r"\S+") |
29 | __parsed_methods__ = bb.methodpool.get_parsed_dict() | 29 | __parsed_methods__ = bb.methodpool.get_parsed_dict() |
@@ -31,7 +31,8 @@ _bbversions_re = re.compile(r"\[(?P<from>[0-9]+)-(?P<to>[0-9]+)\]") | |||
31 | 31 | ||
32 | class StatementGroup(list): | 32 | class StatementGroup(list): |
33 | def eval(self, data): | 33 | def eval(self, data): |
34 | map(lambda x: x.eval(data), self) | 34 | for statement in self: |
35 | statement.eval(data) | ||
35 | 36 | ||
36 | class AstNode(object): | 37 | class AstNode(object): |
37 | pass | 38 | pass |
@@ -341,7 +342,7 @@ def _expand_versions(versions): | |||
341 | versions = iter(versions) | 342 | versions = iter(versions) |
342 | while True: | 343 | while True: |
343 | try: | 344 | try: |
344 | version = versions.next() | 345 | version = next(versions) |
345 | except StopIteration: | 346 | except StopIteration: |
346 | break | 347 | break |
347 | 348 | ||
@@ -351,7 +352,7 @@ def _expand_versions(versions): | |||
351 | else: | 352 | else: |
352 | newversions = expand_one(version, int(range_ver.group("from")), | 353 | newversions = expand_one(version, int(range_ver.group("from")), |
353 | int(range_ver.group("to"))) | 354 | int(range_ver.group("to"))) |
354 | versions = chain(newversions, versions) | 355 | versions = itertools.chain(newversions, versions) |
355 | 356 | ||
356 | def multi_finalize(fn, d): | 357 | def multi_finalize(fn, d): |
357 | safe_d = d | 358 | safe_d = d |
@@ -417,7 +418,7 @@ def multi_finalize(fn, d): | |||
417 | safe_d.setVar("BBCLASSEXTEND", extended) | 418 | safe_d.setVar("BBCLASSEXTEND", extended) |
418 | _create_variants(datastores, extended.split(), extendfunc) | 419 | _create_variants(datastores, extended.split(), extendfunc) |
419 | 420 | ||
420 | for variant, variant_d in datastores.items(): | 421 | for variant, variant_d in datastores.iteritems(): |
421 | if variant: | 422 | if variant: |
422 | try: | 423 | try: |
423 | finalize(fn, variant_d) | 424 | finalize(fn, variant_d) |
@@ -425,7 +426,7 @@ def multi_finalize(fn, d): | |||
425 | bb.data.setVar("__SKIPPED", True, variant_d) | 426 | bb.data.setVar("__SKIPPED", True, variant_d) |
426 | 427 | ||
427 | if len(datastores) > 1: | 428 | if len(datastores) > 1: |
428 | variants = filter(None, datastores.keys()) | 429 | variants = filter(None, datastores.iterkeys()) |
429 | safe_d.setVar("__VARIANTS", " ".join(variants)) | 430 | safe_d.setVar("__VARIANTS", " ".join(variants)) |
430 | 431 | ||
431 | datastores[""] = d | 432 | datastores[""] = d |