aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2021-10-21 19:05:27 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-10-27 09:51:52 -0400
commit894735288920816b9ad668ca27ce2e013a3f2640 (patch)
tree62d4d41bd5adf436507968447480c08120a14a6e /mesonbuild/modules
parent81a2c1b36d91702d82234136ed1868c7118af322 (diff)
downloadmeson-894735288920816b9ad668ca27ce2e013a3f2640.zip
meson-894735288920816b9ad668ca27ce2e013a3f2640.tar.gz
meson-894735288920816b9ad668ca27ce2e013a3f2640.tar.bz2
fix various flake8 whitespace errors
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r--mesonbuild/modules/gnome.py4
-rw-r--r--mesonbuild/modules/java.py2
-rw-r--r--mesonbuild/modules/pkgconfig.py8
-rw-r--r--mesonbuild/modules/python.py10
-rw-r--r--mesonbuild/modules/qt.py2
-rw-r--r--mesonbuild/modules/unstable_external_project.py2
6 files changed, 14 insertions, 14 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 714b68a..10ad22d 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -162,7 +162,7 @@ class GnomeModule(ExtensionModule):
if not found:
prog = self._get_native_binary(state, 'gtk-update-icon-cache', 'gtk+-3.0', 'gtk_update_icon_cache')
icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
- script = state.backend.get_executable_serialisation([prog, '-q', '-t' ,'-f', icondir])
+ script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
script.skip_if_destdir = True
rv.append(script)
if kwargs['update_desktop_database'] and not self.install_update_desktop_database:
@@ -184,7 +184,7 @@ class GnomeModule(ExtensionModule):
glib_compile_resources = state.find_program('glib-compile-resources')
cmd = [glib_compile_resources, '@INPUT@']
- source_dirs, dependencies = (mesonlib.extract_as_list(kwargs, c, pop=True) for c in ['source_dir', 'dependencies'])
+ source_dirs, dependencies = (mesonlib.extract_as_list(kwargs, c, pop=True) for c in ['source_dir', 'dependencies'])
if len(args) < 2:
raise MesonException('Not enough arguments; the name of the resource '
diff --git a/mesonbuild/modules/java.py b/mesonbuild/modules/java.py
index 349ba76..0af5aec 100644
--- a/mesonbuild/modules/java.py
+++ b/mesonbuild/modules/java.py
@@ -38,7 +38,7 @@ class JavaModule(ExtensionModule):
@typed_pos_args('generate_native_header', (str, FileHolder))
@typed_kwargs('java.generate_native_header', KwargInfo('package', str, default=None))
def generate_native_header(self, state: ModuleState, args: T.Tuple[T.Union[str, FileHolder]],
- kwargs: T.Dict[str, T.Optional[str]]) -> ModuleReturnValue:
+ kwargs: T.Dict[str, T.Optional[str]]) -> ModuleReturnValue:
assert state.backend
package = kwargs.get('package')
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index 001d3ca..80d0c51 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -554,8 +554,8 @@ class PkgConfigModule(ExtensionModule):
if not isinstance(pkgroot, str):
raise mesonlib.MesonException('Install_dir must be a string.')
self._generate_pkgconfig_file(state, deps, subdirs, name, description, url,
- version, pcfile, conflicts, variables,
- unescaped_variables, False, dataonly)
+ version, pcfile, conflicts, variables,
+ unescaped_variables, False, dataonly)
res = build.Data([mesonlib.File(True, state.environment.get_scratch_dir(), pcfile)], pkgroot, pkgroot_name, None, state.subproject, install_tag='devel')
variables = self.interpreter.extract_variables(kwargs, argname='uninstalled_variables', dict_new=True)
variables = parse_variable_list(variables)
@@ -564,8 +564,8 @@ class PkgConfigModule(ExtensionModule):
pcfile = filebase + '-uninstalled.pc'
self._generate_pkgconfig_file(state, deps, subdirs, name, description, url,
- version, pcfile, conflicts, variables,
- unescaped_variables, uninstalled=True, dataonly=dataonly)
+ version, pcfile, conflicts, variables,
+ unescaped_variables, uninstalled=True, dataonly=dataonly)
# Associate the main library with this generated pc file. If the library
# is used in any subsequent call to the generated, it will generate a
# 'Requires:' or 'Requires.private:'.
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index fc28b9a..f183177 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -338,7 +338,7 @@ if T.TYPE_CHECKING:
link_libpython: bool
paths: T.Dict[str, str]
platform: str
- suffix : str
+ suffix: str
variables: T.Dict[str, str]
version: str
@@ -501,10 +501,10 @@ class PythonInstallation(ExternalProgramHolder):
mlog.log('Dependency', mlog.bold('python'), 'skipped: feature', mlog.bold(feature), 'disabled')
else:
for d in python_factory(self.interpreter.environment,
- MachineChoice.BUILD if kwargs.get('native', False) else MachineChoice.HOST,
- kwargs,
- process_method_kw({DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM}, kwargs),
- self):
+ MachineChoice.BUILD if kwargs.get('native', False) else MachineChoice.HOST,
+ kwargs,
+ process_method_kw({DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM}, kwargs),
+ self):
dep = d()
if dep.found():
break
diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
index 939dc21..2696562 100644
--- a/mesonbuild/modules/qt.py
+++ b/mesonbuild/modules/qt.py
@@ -173,7 +173,7 @@ class QtBaseModule(ExtensionModule):
self._rcc_supports_depfiles = True
else:
mlog.warning('rcc dependencies will not work properly until you move to Qt >= 5.14:',
- mlog.bold('https://bugreports.qt.io/browse/QTBUG-45460'), fatal=False)
+ mlog.bold('https://bugreports.qt.io/browse/QTBUG-45460'), fatal=False)
else:
suffix = f'-qt{self.qt_version}'
self.tools['moc'] = NonExistingExternalProgram(name='moc' + suffix)
diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py
index bfd3ea6..b8fd1b0 100644
--- a/mesonbuild/modules/unstable_external_project.py
+++ b/mesonbuild/modules/unstable_external_project.py
@@ -26,7 +26,7 @@ from ..interpreterbase import FeatureNew
from ..interpreter.type_checking import ENV_KW
from ..interpreterbase.decorators import ContainerTypeInfo, KwargInfo, typed_kwargs, typed_pos_args
from ..mesonlib import (EnvironmentException, MesonException, Popen_safe, MachineChoice,
- get_variable_regex, do_replacement, join_args, OptionKey)
+ get_variable_regex, do_replacement, join_args, OptionKey)
if T.TYPE_CHECKING:
from typing_extensions import TypedDict