Patchwork [bitbake-devel] ast: Rename PythonMethodNode define variable to modulename

login
register
mail settings
Submitter Richard Purdie
Date Aug. 22, 2012, 12:54 p.m.
Message ID <1345640041.3907.107.camel@ted>
Download mbox | patch
Permalink /patch/35131/
State New
Headers show

Comments

Richard Purdie - Aug. 22, 2012, 12:54 p.m.
It was hard for me to understand what the define variable was, modulename
is hopefully a bit better.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 4d3a623..b7eaff1 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -138,10 +138,10 @@  class MethodNode(AstNode):
             data.setVar(self.func_name, '\n'.join(self.body))
 
 class PythonMethodNode(AstNode):
-    def __init__(self, filename, lineno, function, define, body):
+    def __init__(self, filename, lineno, function, modulename, body):
         AstNode.__init__(self, filename, lineno)
         self.function = function
-        self.define = define
+        self.modulename = modulename
         self.body = body
 
     def eval(self, data):
@@ -149,8 +149,8 @@  class PythonMethodNode(AstNode):
         # 'this' file. This means we will not parse methods from
         # bb classes twice
         text = '\n'.join(self.body)
-        if not bb.methodpool.parsed_module(self.define):
-            bb.methodpool.insert_method(self.define, text, self.filename)
+        if not bb.methodpool.parsed_module(self.modulename):
+            bb.methodpool.insert_method(self.modulename, text, self.filename)
         data.setVarFlag(self.function, "func", 1)
         data.setVarFlag(self.function, "python", 1)
         data.setVar(self.function, text)
@@ -280,8 +280,8 @@  def handleData(statements, filename, lineno, groupd):
 def handleMethod(statements, filename, lineno, func_name, body):
     statements.append(MethodNode(filename, lineno, func_name, body))
 
-def handlePythonMethod(statements, filename, lineno, funcname, root, body):
-    statements.append(PythonMethodNode(filename, lineno, funcname, root, body))
+def handlePythonMethod(statements, filename, lineno, funcname, modulename, body):
+    statements.append(PythonMethodNode(filename, lineno, funcname, modulename, body))
 
 def handleMethodFlags(statements, filename, lineno, key, m):
     statements.append(MethodFlagsNode(filename, lineno, key, m))