diff options
author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-12-31 20:07:53 +0100 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-01 12:02:05 -0500 |
commit | 5693758e4650150d2bf9bcda1baf18334ad26e01 (patch) | |
tree | bbcd6efb04a8687037632734ddb263061d961685 | |
parent | 2a835c2c10c3ae7c7f51db3bfe5af7d5eee33cb0 (diff) | |
download | meson-5693758e4650150d2bf9bcda1baf18334ad26e01.zip meson-5693758e4650150d2bf9bcda1baf18334ad26e01.tar.gz meson-5693758e4650150d2bf9bcda1baf18334ad26e01.tar.bz2 |
style: fix E231 violations
E231: missing whitespace after ','
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
-rw-r--r-- | mesonbuild/backend/vs2010backend.py | 2 | ||||
-rw-r--r-- | mesonbuild/compilers.py | 4 | ||||
-rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
-rw-r--r-- | mesonbuild/mparser.py | 2 | ||||
-rw-r--r-- | mesonbuild/scripts/commandrunner.py | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index fb6d2db..f77013b 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -732,7 +732,7 @@ int dummy; elem.write(outfile) # And then benchmarks. - cmd = [sys.executable, test_exe, '--benchmark','--logbase', + cmd = [sys.executable, test_exe, '--benchmark', '--logbase', 'benchmarklog', '--num-processes=1', '--no-rebuild'] elem = NinjaBuildElement(self.all_outputs, 'benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem.add_item('COMMAND', cmd) diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index e8b60c5..37d4157 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -473,7 +473,7 @@ class Vs2010Backend(backends.Backend): def escape_additional_option(option): # See: https://msdn.microsoft.com/en-us/library/bb383819.aspx table = str.maketrans({'%': '%25', '$': '%24', '@': '%40', - "'": '%27', ';': '%3B', '?': '%3F', '*': '%2A', ' ': '%20',}) + "'": '%27', ';': '%3B', '?': '%3F', '*': '%2A', ' ': '%20'}) option = option.translate(table) # Since we're surrounding the option with ", if it ends in \ that will # escape the " when the process arguments are parsed and the starting diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 4e245e1..a194277 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -2226,7 +2226,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler): # too strict without this and always fails. return self.get_no_optimization_args() + ['-fpermissive'] -class GnuObjCCompiler(GnuCompiler,ObjCCompiler): +class GnuObjCCompiler(GnuCompiler, ObjCCompiler): def __init__(self, exelist, version, is_cross, exe_wrapper=None, defines=None): ObjCCompiler.__init__(self, exelist, version, is_cross, exe_wrapper) @@ -2329,7 +2329,7 @@ class ClangCCompiler(ClangCompiler, CCompiler): def get_options(self): return {'c_std': coredata.UserComboOption('c_std', 'C language standard to use', ['none', 'c89', 'c99', 'c11', - 'gnu89', 'gnu99', 'gnu11',], + 'gnu89', 'gnu99', 'gnu11'], 'none')} def get_option_compile_args(self, options): diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index c693c8d..aaf0746 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -130,7 +130,7 @@ class PkgConfigModule: priv_reqs = mesonlib.stringlistify(kwargs.get('requires_private', [])) conflicts = mesonlib.stringlistify(kwargs.get('conflicts', [])) pcfile = filebase + '.pc' - pkgroot = kwargs.get('install_dir',None) + pkgroot = kwargs.get('install_dir', None) if pkgroot is None: pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig') if not isinstance(pkgroot, str): diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py index 2fc2487..850446d 100644 --- a/mesonbuild/mparser.py +++ b/mesonbuild/mparser.py @@ -207,7 +207,7 @@ class ComparisonNode: self.ctype = ctype class ArithmeticNode: - def __init__(self,operation, left, right): + def __init__(self, operation, left, right): self.subdir = left.subdir self.lineno = left.lineno self.colno = left.colno diff --git a/mesonbuild/scripts/commandrunner.py b/mesonbuild/scripts/commandrunner.py index 695301b..30a7da2 100644 --- a/mesonbuild/scripts/commandrunner.py +++ b/mesonbuild/scripts/commandrunner.py @@ -35,7 +35,7 @@ def run_command(source_dir, build_dir, subdir, command, arguments): fullpath = os.path.join(source_dir, subdir, command) command_array = [fullpath] + arguments try: - return subprocess.Popen(command_array,env=child_env, cwd=cwd) + return subprocess.Popen(command_array, env=child_env, cwd=cwd) except FileNotFoundError: print('Could not execute command "%s".' % command) sys.exit(1) |