Fix flake8 errors

pull/4791/head
Xavier Claessens 6 years ago committed by Xavier Claessens
parent 815f1205a8
commit 83766b3687
  1. 2
      mesonbuild/astinterpreter.py
  2. 3
      mesonbuild/interpreter.py
  3. 1
      mesonbuild/interpreterbase.py
  4. 3
      mesonbuild/modules/python.py

@ -15,7 +15,7 @@
# This class contains the basic functionality needed to run any interpreter # This class contains the basic functionality needed to run any interpreter
# or an interpreter-based tool. # or an interpreter-based tool.
from . import interpreterbase, mlog, mparser, mesonlib from . import interpreterbase, mparser, mesonlib
from . import environment from . import environment
from .interpreterbase import InterpreterException, InvalidArguments, BreakRequest, ContinueRequest from .interpreterbase import InterpreterException, InvalidArguments, BreakRequest, ContinueRequest

@ -37,7 +37,6 @@ import re, shlex
import subprocess import subprocess
from collections import namedtuple from collections import namedtuple
from pathlib import PurePath from pathlib import PurePath
import traceback
import functools import functools
import importlib import importlib
@ -3062,7 +3061,7 @@ external dependencies (including libraries) must go to "dependencies".''')
sp_kwargs = { sp_kwargs = {
'default_options': kwargs.get('default_options', []), 'default_options': kwargs.get('default_options', []),
'required': kwargs.get('required', True), 'required': kwargs.get('required', True),
} }
self.do_subproject(dirname, sp_kwargs) self.do_subproject(dirname, sp_kwargs)
return self.get_subproject_dep(display_name, dirname, varname, kwargs) return self.get_subproject_dep(display_name, dirname, varname, kwargs)

@ -749,7 +749,6 @@ The result of this is undefined and will become a hard error in a future Meson r
except IndexError: except IndexError:
raise InterpreterException('Index %d out of bounds of array of size %d.' % (index, len(iobject))) raise InterpreterException('Index %d out of bounds of array of size %d.' % (index, len(iobject)))
def function_call(self, node): def function_call(self, node):
func_name = node.func_name func_name = node.func_name
(posargs, kwargs) = self.reduce_arguments(node.args) (posargs, kwargs) = self.reduce_arguments(node.args)

@ -23,11 +23,10 @@ from . import ExtensionModule
from mesonbuild.modules import ModuleReturnValue from mesonbuild.modules import ModuleReturnValue
from ..interpreterbase import ( from ..interpreterbase import (
noPosargs, noKwargs, permittedKwargs, noPosargs, noKwargs, permittedKwargs,
InterpreterObject, InvalidArguments, InvalidArguments,
FeatureNew, FeatureNewKwargs, disablerIfNotFound FeatureNew, FeatureNewKwargs, disablerIfNotFound
) )
from ..interpreter import ExternalProgramHolder, extract_required_kwarg from ..interpreter import ExternalProgramHolder, extract_required_kwarg
from ..interpreterbase import flatten
from ..build import known_shmod_kwargs from ..build import known_shmod_kwargs
from .. import mlog from .. import mlog
from ..environment import detect_cpu_family from ..environment import detect_cpu_family

Loading…
Cancel
Save