diff options
| -rw-r--r-- | mesonbuild/ast/interpreter.py | 4 | ||||
| -rw-r--r-- | mesonbuild/ast/introspection.py | 5 | ||||
| -rw-r--r-- | mesonbuild/rewriter.py | 5 | ||||
| -rwxr-xr-x | run_unittests.py | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index 81f6d58..2071432 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -18,7 +18,7 @@ from .. import interpreterbase, mparser, mesonlib from .. import environment -from ..interpreterbase import InterpreterException, InvalidArguments, BreakRequest, ContinueRequest +from ..interpreterbase import InvalidArguments, BreakRequest, ContinueRequest import os, sys @@ -204,6 +204,6 @@ class AstInterpreter(interpreterbase.InterpreterBase): flattend_kwargs[key] = val.value elif isinstance(val, (mparser.ArrayNode, mparser.ArgumentNode)): flattend_kwargs[key] = self.flatten_args(val, include_unknown_args) - elif isinstance(val, (str, bool, int, float)) or include_unknown_args: + elif isinstance(val, (str, bool, int, float)) or include_unknown_args: flattend_kwargs[key] = val return flattend_kwargs diff --git a/mesonbuild/ast/introspection.py b/mesonbuild/ast/introspection.py index 11496db..5d0ec5a 100644 --- a/mesonbuild/ast/introspection.py +++ b/mesonbuild/ast/introspection.py @@ -19,9 +19,8 @@ from . import AstInterpreter from .. import compilers, environment, mesonlib, mparser, optinterpreter from .. import coredata as cdata from ..interpreterbase import InvalidArguments -from ..build import Executable, CustomTarget, Jar, RunTarget, SharedLibrary, SharedModule, StaticLibrary -from pprint import pprint -import sys, os +from ..build import Executable, Jar, SharedLibrary, SharedModule, StaticLibrary +import os build_target_functions = ['executable', 'jar', 'library', 'shared_library', 'shared_module', 'static_library', 'both_libraries'] diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index dfed1c6..f66da33 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -23,10 +23,9 @@ # - move targets # - reindent? -from .ast import IntrospectionInterpreter, build_target_functions, AstVisitor, AstIDGenerator, AstIndentationGenerator, AstPrinter +from .ast import IntrospectionInterpreter, build_target_functions, AstIDGenerator, AstIndentationGenerator, AstPrinter from mesonbuild.mesonlib import MesonException from . import mlog, mparser, environment -import traceback from functools import wraps from pprint import pprint import json, os @@ -269,7 +268,7 @@ class Rewriter: node = i['node'] line = node.lineno - 1 col = node.colno - start = offsets[line]+col + start = offsets[line] + col end = start if isinstance(node, mparser.ArrayNode): if raw[end] != '[': diff --git a/run_unittests.py b/run_unittests.py index 711621b..e52a15e 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -4917,6 +4917,8 @@ class PythonTests(BasePlatformTests): class RewriterTests(BasePlatformTests): + data_regex = re.compile(r'^\s*!!\s*(\w+)\s+([^=]+)=(.*)$') + def setUp(self): super().setUp() self.maxDiff = None @@ -4931,7 +4933,6 @@ class RewriterTests(BasePlatformTests): universal_newlines=True) return out - data_regex = re.compile(r'^\s*!!\s*(\w+)\s+([^=]+)=(.*)$') def extract_test_data(self, out): lines = out.split('\n') result = {} |