From: Chris Larson Date: Tue, 4 Jan 2011 20:07:27 +0000 (-0700) Subject: parse.ast: drop __word__ regular expression X-Git-Tag: 2011-1~2981 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=37391f667f0ccb47740243de77e14d60b0797280;p=openembedded-core.git parse.ast: drop __word__ regular expression We can use the string split method for this instead. (Bitbake rev: aa9646717b3ee1006628246a7c495f601e62391c) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index fe2674d432..e34f1fe894 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py @@ -31,7 +31,6 @@ import itertools from bb import methodpool from bb.parse import logger -__word__ = re.compile(r"\S+") __parsed_methods__ = bb.methodpool.get_parsed_dict() _bbversions_re = re.compile(r"\[(?P[0-9]+)-(?P[0-9]+)\]") @@ -180,7 +179,7 @@ class MethodFlagsNode(AstNode): class ExportFuncsNode(AstNode): def __init__(self, fns, classes): - self.n = __word__.findall(fns) + self.n = fns.split() self.classes = classes def eval(self, data): @@ -250,7 +249,7 @@ class AddTaskNode(AstNode): class BBHandlerNode(AstNode): def __init__(self, fns): - self.hs = __word__.findall(fns) + self.hs = fns.split() def eval(self, data): bbhands = bb.data.getVar('__BBHANDLERS', data) or [] @@ -301,7 +300,7 @@ def handleBBHandlers(statements, m): def handleInherit(statements, m): classes = m.group(1) - statements.append(InheritNode(__word__.findall(classes))) + statements.append(InheritNode(classes.split())) def finalize(fn, d, variant = None): for lazykey in bb.data.getVar("__lazy_assigned", d) or ():