aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-12-30 20:29:20 -0500
committerXavier Claessens <xclaesse@gmail.com>2019-01-16 11:16:46 -0500
commit83766b3687b3d639af5175e9b1dc8fd039659b55 (patch)
tree8e67cc061b76fccaaee6a492b45c52aeb94411c6
parent815f1205a8d2eb78fa71057c593f4eec3746aad3 (diff)
downloadmeson-83766b3687b3d639af5175e9b1dc8fd039659b55.zip
meson-83766b3687b3d639af5175e9b1dc8fd039659b55.tar.gz
meson-83766b3687b3d639af5175e9b1dc8fd039659b55.tar.bz2
Fix flake8 errors
-rw-r--r--mesonbuild/astinterpreter.py2
-rw-r--r--mesonbuild/interpreter.py3
-rw-r--r--mesonbuild/interpreterbase.py1
-rw-r--r--mesonbuild/modules/python.py3
4 files changed, 3 insertions, 6 deletions
diff --git a/mesonbuild/astinterpreter.py b/mesonbuild/astinterpreter.py
index a447a55..f68aa7a 100644
--- a/mesonbuild/astinterpreter.py
+++ b/mesonbuild/astinterpreter.py
@@ -15,7 +15,7 @@
# This class contains the basic functionality needed to run any interpreter
# or an interpreter-based tool.
-from . import interpreterbase, mlog, mparser, mesonlib
+from . import interpreterbase, mparser, mesonlib
from . import environment
from .interpreterbase import InterpreterException, InvalidArguments, BreakRequest, ContinueRequest
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 1e36bf1..7ee9a3f 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -37,7 +37,6 @@ import re, shlex
import subprocess
from collections import namedtuple
from pathlib import PurePath
-import traceback
import functools
import importlib
@@ -3062,7 +3061,7 @@ external dependencies (including libraries) must go to "dependencies".''')
sp_kwargs = {
'default_options': kwargs.get('default_options', []),
'required': kwargs.get('required', True),
- }
+ }
self.do_subproject(dirname, sp_kwargs)
return self.get_subproject_dep(display_name, dirname, varname, kwargs)
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py
index 707b8f7..48c5220 100644
--- a/mesonbuild/interpreterbase.py
+++ b/mesonbuild/interpreterbase.py
@@ -749,7 +749,6 @@ The result of this is undefined and will become a hard error in a future Meson r
except IndexError:
raise InterpreterException('Index %d out of bounds of array of size %d.' % (index, len(iobject)))
-
def function_call(self, node):
func_name = node.func_name
(posargs, kwargs) = self.reduce_arguments(node.args)
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index c14ac85..1d41165 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -23,11 +23,10 @@ from . import ExtensionModule
from mesonbuild.modules import ModuleReturnValue
from ..interpreterbase import (
noPosargs, noKwargs, permittedKwargs,
- InterpreterObject, InvalidArguments,
+ InvalidArguments,
FeatureNew, FeatureNewKwargs, disablerIfNotFound
)
from ..interpreter import ExternalProgramHolder, extract_required_kwarg
-from ..interpreterbase import flatten
from ..build import known_shmod_kwargs
from .. import mlog
from ..environment import detect_cpu_family