aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xmanual tests/4 standalone binaries/build_windows_package.py4
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/compilers.py4
-rw-r--r--mesonbuild/coredata.py8
-rw-r--r--mesonbuild/mconf.py4
-rw-r--r--mesonbuild/mesonmain.py2
-rw-r--r--mesonbuild/modules/gnome.py15
-rw-r--r--mesonbuild/modules/i18n.py2
-rw-r--r--mesonbuild/modules/qt4.py6
-rw-r--r--mesonbuild/modules/qt5.py6
-rw-r--r--mesonbuild/scripts/gettext.py2
-rw-r--r--mesonbuild/wrap/wrap.py6
12 files changed, 31 insertions, 32 deletions
diff --git a/manual tests/4 standalone binaries/build_windows_package.py b/manual tests/4 standalone binaries/build_windows_package.py
index c676113..c361aa0 100755
--- a/manual tests/4 standalone binaries/build_windows_package.py
+++ b/manual tests/4 standalone binaries/build_windows_package.py
@@ -23,10 +23,10 @@ libs = glob(os.path.join('build', sdl_dir, 'lib/x86/*'))
# Sorry for this hack but this needs to work during development
# when Meson is not in path.
subprocess.check_call(['python3', r'..\..\meson.py', 'build',
- '--backend=ninja', '--buildtype=release'])
+ '--backend=ninja', '--buildtype=release'])
subprocess.check_call(['ninja'], cwd='build')
shutil.copy('myapp.iss', 'build')
subprocess.check_call([r'\Program Files\Inno Setup 5\ISCC.exe', 'myapp.iss'],
- cwd = 'build')
+ cwd = 'build')
shutil.copy('build/setup.exe', 'myapp 1.0.exe')
shutil.rmtree('build')
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 60383af..429bb64 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -501,7 +501,7 @@ int dummy;
os.makedirs(abs_pdir, exist_ok=True)
elem.add_item('DEPFILE', rel_dfile)
elem.add_item('COMMAND', cmd)
- elem.add_item('description', desc.format(target.name, cmd_type))
+ elem.add_item('description', desc.format(target.name, cmd_type))
elem.write(outfile)
self.processed_targets[target.name + target.type_suffix()] = True
@@ -1019,7 +1019,7 @@ int dummy;
valac_outputs.append(vapiname)
if isinstance(target.vala_gir, str):
girname = os.path.join(self.get_target_dir(target), target.vala_gir)
- args += ['--gir', os.path.join('..', target.vala_gir)]
+ args += ['--gir', os.path.join('..', target.vala_gir)]
valac_outputs.append(girname)
if self.environment.coredata.get_builtin_option('werror'):
args += valac.get_werror_args()
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index 8212d01..bd8d0a1 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -203,8 +203,8 @@ base_options = {
'Enable coverage tracking.',
False),
'b_colorout': coredata.UserComboOption('b_colorout', 'Use colored output',
- ['auto', 'always', 'never'],
- 'always'),
+ ['auto', 'always', 'never'],
+ 'always'),
'b_ndebug': coredata.UserBooleanOption('b_ndebug',
'Disable asserts',
False),
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index cc242f4..a9dbcdd 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -43,7 +43,7 @@ class UserStringOption(UserOption):
class UserBooleanOption(UserOption):
def __init__(self, name, description, value):
- super().__init__(name, description, [ True, False ])
+ super().__init__(name, description, [True, False])
self.set_value(value)
def tobool(self, thing):
@@ -134,7 +134,7 @@ class CoreData():
def init_builtins(self, options):
self.builtins = {}
for key in get_builtin_options():
- args = [key] + builtin_options[key][1:-1] + [ getattr(options, key, get_builtin_option_default(key)) ]
+ args = [key] + builtin_options[key][1:-1] + [getattr(options, key, get_builtin_option_default(key))]
self.builtins[key] = builtin_options[key][0](*args)
def get_builtin_option(self, optname):
@@ -179,7 +179,7 @@ def get_builtin_option_choices(optname):
if builtin_options[optname][0] == UserStringOption:
return None
elif builtin_options[optname][0] == UserBooleanOption:
- return [ True, False ]
+ return [True, False]
else:
return builtin_options[optname][2]
else:
@@ -227,7 +227,7 @@ builtin_options = {
'localstatedir': [UserStringOption, 'Localstate data directory.', 'var'],
'sharedstatedir': [UserStringOption, 'Architecture-independent data directory.', 'com'],
'werror': [UserBooleanOption, 'Treat warnings as errors.', False],
- 'warning_level': [UserComboOption, 'Compiler warning level to use.', [ '1', '2', '3' ], '1'],
+ 'warning_level': [UserComboOption, 'Compiler warning level to use.', ['1', '2', '3'], '1'],
'layout': [UserComboOption, 'Build directory layout.', ['mirror', 'flat'], 'mirror'],
'default_library': [UserComboOption, 'Default library type.', ['shared', 'static'], 'shared'],
'backend': [UserComboOption, 'Backend to use.', backendlist, 'ninja'],
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
index 8ddf4fe..d6b7624 100644
--- a/mesonbuild/mconf.py
+++ b/mesonbuild/mconf.py
@@ -128,7 +128,7 @@ class Conf:
print('')
print('Core options:')
carr = []
- for key in [ 'buildtype', 'warning_level', 'werror', 'strip', 'unity', 'default_library' ]:
+ for key in ['buildtype', 'warning_level', 'werror', 'strip', 'unity', 'default_library']:
carr.append([key, coredata.get_builtin_option_description(key),
self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)])
self.print_aligned(carr)
@@ -204,7 +204,7 @@ class Conf:
print('')
print('Testing options:')
tarr = []
- for key in [ 'stdsplit', 'errorlogs' ]:
+ for key in ['stdsplit', 'errorlogs']:
tarr.append([key, coredata.get_builtin_option_description(key),
self.coredata.get_builtin_option(key), coredata.get_builtin_option_choices(key)])
self.print_aligned(tarr)
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 98d072b..23501f8 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -29,7 +29,7 @@ default_warning = '1'
def add_builtin_argument(name, **kwargs):
k = kwargs.get('dest', name.replace('-', '_'))
c = coredata.get_builtin_option_choices(k)
- b = True if kwargs.get('action', None) in [ 'store_true', 'store_false' ] else False
+ b = True if kwargs.get('action', None) in ['store_true', 'store_false'] else False
h = coredata.get_builtin_option_description(k)
if not b:
h = h.rstrip('.') + ' (default: %s).' % coredata.get_builtin_option_default(k)
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 3f88585..f7aa0f2 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -593,15 +593,15 @@ can not be used with the current version of glib-compiled-resources, due to
'--id=' + project_id,
'--sources=' + source_str]
pottarget = build.RunTarget('help-' + project_id + '-pot', sys.executable,
- potargs, [], state.subdir)
+ potargs, [], state.subdir)
poargs = [state.environment.get_build_command(), '--internal', 'yelphelper', 'update-po',
- '--subdir=' + state.subdir,
- '--id=' + project_id,
- '--sources=' + source_str,
- '--langs=' + '@@'.join(langs)]
+ '--subdir=' + state.subdir,
+ '--id=' + project_id,
+ '--sources=' + source_str,
+ '--langs=' + '@@'.join(langs)]
potarget = build.RunTarget('help-' + project_id + '-update-po', sys.executable,
- poargs, [], state.subdir)
+ poargs, [], state.subdir)
return [inscript, pottarget, potarget]
@@ -1015,8 +1015,7 @@ can not be used with the current version of glib-compiled-resources, due to
for i in inputs:
if isinstance(i, str):
cmd.append(os.path.join(source_dir, i))
- elif hasattr(i, 'held_object') \
- and isinstance(i.held_object, GirTarget):
+ elif hasattr(i, 'held_object') and isinstance(i.held_object, GirTarget):
link_with += self._get_vapi_link_with(i.held_object)
subdir = os.path.join(state.environment.get_build_dir(),
i.held_object.get_subdir())
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py
index 097eedd..4b4ae3d 100644
--- a/mesonbuild/modules/i18n.py
+++ b/mesonbuild/modules/i18n.py
@@ -105,7 +105,7 @@ class I18nModule:
updatepoargs.append(extra_args)
updatepotarget = build.RunTarget(packagename + '-update-po', sys.executable, updatepoargs, [], state.subdir)
- script = [sys.executable, state.environment.get_build_command()]
+ script = [sys.executable, state.environment.get_build_command()]
args = ['--internal', 'gettext', 'install',
'--subdir=' + state.subdir,
'--localedir=' + state.environment.coredata.get_builtin_option('localedir'),
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py
index 8670533..beb7ca5 100644
--- a/mesonbuild/modules/qt4.py
+++ b/mesonbuild/modules/qt4.py
@@ -44,7 +44,7 @@ class Qt4Module():
moc_ver = stderr
else:
raise MesonException('Moc preprocessor is not for Qt 4. Output:\n%s\n%s' %
- (stdout, stderr))
+ (stdout, stderr))
mlog.log(' moc:', mlog.green('YES'), '(%s, %s)' % \
(' '.join(self.moc.fullpath), moc_ver.split()[-1]))
else:
@@ -57,7 +57,7 @@ class Qt4Module():
uic_ver = stderr
else:
raise MesonException('Uic compiler is not for Qt4. Output:\n%s\n%s' %
- (stdout, stderr))
+ (stdout, stderr))
mlog.log(' uic:', mlog.green('YES'), '(%s, %s)' % \
(' '.join(self.uic.fullpath), uic_ver.split()[-1]))
else:
@@ -70,7 +70,7 @@ class Qt4Module():
rcc_ver = stderr
else:
raise MesonException('Rcc compiler is not for Qt 4. Output:\n%s\n%s' %
- (stdout, stderr))
+ (stdout, stderr))
mlog.log(' rcc:', mlog.green('YES'), '(%s, %s)'\
% (' '.join(self.rcc.fullpath), rcc_ver.split()[-1]))
else:
diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py
index 7a9f8f5..2e348db 100644
--- a/mesonbuild/modules/qt5.py
+++ b/mesonbuild/modules/qt5.py
@@ -46,7 +46,7 @@ class Qt5Module():
moc_ver = stdout
else:
raise MesonException('Moc preprocessor is not for Qt 5. Output:\n%s\n%s' %
- (stdout, stderr))
+ (stdout, stderr))
mlog.log(' moc:', mlog.green('YES'), '(%s, %s)' % \
(' '.join(self.moc.fullpath), moc_ver.split()[-1]))
else:
@@ -61,7 +61,7 @@ class Qt5Module():
uic_ver = stdout
else:
raise MesonException('Uic compiler is not for Qt 5. Output:\n%s\n%s' %
- (stdout, stderr))
+ (stdout, stderr))
mlog.log(' uic:', mlog.green('YES'), '(%s, %s)' % \
(' '.join(self.uic.fullpath), uic_ver.split()[-1]))
else:
@@ -76,7 +76,7 @@ class Qt5Module():
rcc_ver = stdout
else:
raise MesonException('Rcc compiler is not for Qt 5. Output:\n%s\n%s' %
- (stdout, stderr))
+ (stdout, stderr))
mlog.log(' rcc:', mlog.green('YES'), '(%s, %s)'\
% (' '.join(self.rcc.fullpath), rcc_ver.split()[-1]))
else:
diff --git a/mesonbuild/scripts/gettext.py b/mesonbuild/scripts/gettext.py
index d463313..624790d 100644
--- a/mesonbuild/scripts/gettext.py
+++ b/mesonbuild/scripts/gettext.py
@@ -58,7 +58,7 @@ def run_potgen(src_sub, pkgname, datadirs, args):
ofile = os.path.join(src_sub, pkgname + '.pot')
return subprocess.call(['xgettext', '--package-name=' + pkgname, '-p', src_sub, '-f', listfile,
'-D', os.environ['MESON_SOURCE_ROOT'], '-k_', '-o', ofile] + args,
- env=child_env)
+ env=child_env)
def gen_gmo(src_sub, bld_sub, langs):
for l in langs:
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index dead6fb..d812b4e 100644
--- a/mesonbuild/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
@@ -133,9 +133,9 @@ class Resolver:
is_there = True
except subprocess.CalledProcessError:
raise RuntimeError('%s is not empty but is not a valid '
- 'git repository, we can not work with it'
- ' as a subproject directory.' % (
- checkoutdir))
+ 'git repository, we can not work with it'
+ ' as a subproject directory.' % (
+ checkoutdir))
if revno.lower() == 'head':
# Failure to do pull is not a fatal error,
generated by cgit v1.1 at 2025-04-03 15:02:14 +0000