diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-02 23:30:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 23:30:29 +0300 |
| commit | 1f4023fa47803458700e52352dec51f3f85fa6c1 (patch) | |
| tree | e4b2790ff92404ad6f939832922770b9a359908e /mesonbuild/ast | |
| parent | 06bfc2dab61c5bf79265a8db777b02732ee86ecf (diff) | |
| parent | 74b535fea74843c83944e9f22d40e6259ca105b8 (diff) | |
| download | meson-1f4023fa47803458700e52352dec51f3f85fa6c1.zip meson-1f4023fa47803458700e52352dec51f3f85fa6c1.tar.gz meson-1f4023fa47803458700e52352dec51f3f85fa6c1.tar.bz2 | |
Merge pull request #5311 from mensinda/flake8Plugins
Added flake8 plugins and some code fixes
Diffstat (limited to 'mesonbuild/ast')
| -rw-r--r-- | mesonbuild/ast/introspection.py | 8 | ||||
| -rw-r--r-- | mesonbuild/ast/visitor.py | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/mesonbuild/ast/introspection.py b/mesonbuild/ast/introspection.py index 49d531f..b6ec450 100644 --- a/mesonbuild/ast/introspection.py +++ b/mesonbuild/ast/introspection.py @@ -122,7 +122,7 @@ class IntrospectionInterpreter(AstInterpreter): subi.analyze() subi.project_data['name'] = dirname self.project_data['subprojects'] += [subi.project_data] - except: + except (mesonlib.MesonException, RuntimeError): return def func_add_languages(self, node, args, kwargs): @@ -173,9 +173,9 @@ class IntrospectionInterpreter(AstInterpreter): arg_node = curr.args elif isinstance(curr, IdNode): # Try to resolve the ID and append the node to the queue - id = curr.value - if id in self.assignments and self.assignments[id]: - tmp_node = self.assignments[id][0] + var_name = curr.value + if var_name in self.assignments and self.assignments[var_name]: + tmp_node = self.assignments[var_name][0] if isinstance(tmp_node, (ArrayNode, IdNode, FunctionNode)): srcqueue += [tmp_node] elif isinstance(curr, ArithmeticNode): diff --git a/mesonbuild/ast/visitor.py b/mesonbuild/ast/visitor.py index c8769d4..fab4ed2 100644 --- a/mesonbuild/ast/visitor.py +++ b/mesonbuild/ast/visitor.py @@ -134,7 +134,5 @@ class AstVisitor: self.visit_default_func(node) for i in node.arguments: i.accept(self) - for i in node.commas: - pass for val in node.kwargs.values(): val.accept(self) |