From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 25 Nov 2013 23:00:17 +0000 (+0000)
Subject: codeparser: Drop unneeded variable separation
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64d4cbd6360c96574cece70205ea3aecc3f8bae6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

codeparser: Drop unneeded variable separation

There is no good reason to separately track var_references and
references so merge them and remove the unneeded variable.

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

diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py
index e44e7915851..116481559ac 100644
--- a/lib/bb/codeparser.py
+++ b/lib/bb/codeparser.py
@@ -122,7 +122,7 @@ class PythonParser():
         name = self.called_node_name(node.func)
         if name in self.getvars or name in self.containsfuncs:
             if isinstance(node.args[0], ast.Str):
-                self.var_references.add(node.args[0].s)
+                self.references.add(node.args[0].s)
             else:
                 self.warn(node.func, node.args[0])
         elif name in self.execfuncs:
@@ -147,7 +147,6 @@ class PythonParser():
                 break
 
     def __init__(self, name, log):
-        self.var_references = set()
         self.var_execs = set()
         self.execs = set()
         self.references = set()
@@ -177,7 +176,6 @@ class PythonParser():
             if n.__class__.__name__ == "Call":
                 self.visit_Call(n)
 
-        self.references.update(self.var_references)
         self.references.update(self.var_execs)
 
         codeparsercache.pythoncacheextras[h] = {}