parse.ast: avoid code duplication for inherit

(Bitbake rev: 0b11a3d4eab84b372fd45b9537cf0327008daf8d)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 55ab48599..fe2674d43 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -260,11 +260,11 @@ class BBHandlerNode(AstNode):
         bb.data.setVar('__BBHANDLERS', bbhands, data)
 
 class InheritNode(AstNode):
-    def __init__(self, files):
-        self.n = __word__.findall(files)
+    def __init__(self, classes):
+        self.classes = classes
 
     def eval(self, data):
-        bb.parse.BBHandler.inherit(self.n, data)
+        bb.parse.BBHandler.inherit(self.classes, data)
 
 def handleInclude(statements, m, fn, lineno, force):
     statements.append(IncludeNode(m.group(1), fn, lineno, force))
@@ -300,9 +300,8 @@ def handleBBHandlers(statements, m):
     statements.append(BBHandlerNode(m.group(1)))
 
 def handleInherit(statements, m):
-    files = m.group(1)
-    n = __word__.findall(files)
-    statements.append(InheritNode(m.group(1)))
+    classes = m.group(1)
+    statements.append(InheritNode(__word__.findall(classes)))
 
 def finalize(fn, d, variant = None):
     for lazykey in bb.data.getVar("__lazy_assigned", d) or ():