diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-22 21:33:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-22 21:33:34 +0300 |
commit | be0aa7fd740d5808975868e32649c464e031f526 (patch) | |
tree | e4bd6488d66a602edb3ba65e97ff12834974edac /mesonbuild/modules/gnome.py | |
parent | 2ab4b397a85071fc3c10cfab60373e9ad88e5d0f (diff) | |
parent | 68d4c1e559fef510e257b36d69fd907b16830efd (diff) | |
download | meson-be0aa7fd740d5808975868e32649c464e031f526.zip meson-be0aa7fd740d5808975868e32649c464e031f526.tar.gz meson-be0aa7fd740d5808975868e32649c464e031f526.tar.bz2 |
Merge pull request #2357 from LukeShu/flake8
Bring into compliance with flake8
Diffstat (limited to 'mesonbuild/modules/gnome.py')
-rw-r--r-- | mesonbuild/modules/gnome.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 137d380..1ab075b 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -17,7 +17,6 @@ functionality such as gobject-introspection, gresources and gtk-doc''' from .. import build import os -import sys import copy import subprocess from . import ModuleReturnValue @@ -30,7 +29,7 @@ from .. import interpreter from . import GResourceTarget, GResourceHeaderTarget, GirTarget, TypelibTarget, VapiTarget from . import find_program, get_include_args from . import ExtensionModule -from . import noKwargs, permittedKwargs +from ..interpreterbase import noKwargs, permittedKwargs # gresource compilation is broken due to the way # the resource compiler and Ninja clash about it @@ -697,18 +696,22 @@ This will become a hard error in the future.''') args.append('--langs=' + '@@'.join(langs)) inscript = build.RunScript(script, args) - potargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'pot', - '--subdir=' + state.subdir, - '--id=' + project_id, - '--sources=' + source_str] + potargs = state.environment.get_build_command() + [ + '--internal', 'yelphelper', 'pot', + '--subdir=' + state.subdir, + '--id=' + project_id, + '--sources=' + source_str, + ] pottarget = build.RunTarget('help-' + project_id + '-pot', potargs[0], potargs[1:], [], state.subdir) - poargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'update-po', - '--subdir=' + state.subdir, - '--id=' + project_id, - '--sources=' + source_str, - '--langs=' + '@@'.join(langs)] + poargs = state.environment.get_build_command() + [ + '--internal', 'yelphelper', 'update-po', + '--subdir=' + state.subdir, + '--id=' + project_id, + '--sources=' + source_str, + '--langs=' + '@@'.join(langs), + ] potarget = build.RunTarget('help-' + project_id + '-update-po', poargs[0], poargs[1:], [], state.subdir) |