aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2016-12-31 19:50:15 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-01-01 12:02:05 -0500
commitf0b30baa39180a1047da362eb1411157228d18b7 (patch)
tree1fa609b6ac6102fc841f593ea5c6338578d78fd0 /mesonbuild
parent15629d2fae237f71e4c9d67b519e7ef70e9eba78 (diff)
downloadmeson-f0b30baa39180a1047da362eb1411157228d18b7.zip
meson-f0b30baa39180a1047da362eb1411157228d18b7.tar.gz
meson-f0b30baa39180a1047da362eb1411157228d18b7.tar.bz2
style: fix E225 violations
E225: missing whitespace around operator Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/backends.py2
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/backend/vs2010backend.py22
-rw-r--r--mesonbuild/backend/xcodebackend.py134
-rw-r--r--mesonbuild/compilers.py2
-rw-r--r--mesonbuild/coredata.py2
-rw-r--r--mesonbuild/environment.py2
-rw-r--r--mesonbuild/interpreterbase.py2
-rw-r--r--mesonbuild/mintro.py10
-rw-r--r--mesonbuild/modules/gnome.py4
-rw-r--r--mesonbuild/mparser.py2
-rw-r--r--mesonbuild/scripts/yelphelper.py8
12 files changed, 97 insertions, 97 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index cde8d70..14d3a31 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -34,7 +34,7 @@ class CleanTrees():
class InstallData():
def __init__(self, source_dir, build_dir, prefix):
self.source_dir = source_dir
- self.build_dir= build_dir
+ self.build_dir = build_dir
self.prefix = prefix
self.targets = []
self.headers = []
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index c0862ba..dcabd0b 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1623,7 +1623,7 @@ rule FORTRAN_DEP_HACK
mod_files = []
usere = re.compile(r"\s*use\s+(\w+)", re.IGNORECASE)
dirname = self.get_target_private_dir(target)
- tdeps= self.fortran_deps[target.get_basename()]
+ tdeps = self.fortran_deps[target.get_basename()]
with open(src) as f:
for line in f:
usematch = usere.match(line)
@@ -1850,7 +1850,7 @@ rule FORTRAN_DEP_HACK
if idir not in custom_target_include_dirs:
custom_target_include_dirs.append(idir)
for i in custom_target_include_dirs:
- commands+= compiler.get_include_args(i, False)
+ commands += compiler.get_include_args(i, False)
if self.environment.coredata.base_options.get('b_pch', False):
commands += self.get_pch_include_args(compiler, target)
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index b28262d..5738dd7 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -334,7 +334,7 @@ class Vs2010Backend(backends.Backend):
prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform})
p = ET.SubElement(prjconf, 'Configuration')
- p.text= self.buildtype
+ p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
@@ -343,8 +343,8 @@ class Vs2010Backend(backends.Backend):
kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj'
p = ET.SubElement(globalgroup, 'Platform')
- p.text= self.platform
- pname= ET.SubElement(globalgroup, 'ProjectName')
+ p.text = self.platform
+ pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.Default.props')
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
@@ -565,7 +565,7 @@ class Vs2010Backend(backends.Backend):
prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform})
p = ET.SubElement(prjconf, 'Configuration')
- p.text= self.buildtype
+ p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform
# Globals
@@ -577,8 +577,8 @@ class Vs2010Backend(backends.Backend):
ns = ET.SubElement(globalgroup, 'RootNamespace')
ns.text = target_name
p = ET.SubElement(globalgroup, 'Platform')
- p.text= self.platform
- pname= ET.SubElement(globalgroup, 'ProjectName')
+ p.text = self.platform
+ pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.Default.props')
# Start configuration
@@ -931,7 +931,7 @@ class Vs2010Backend(backends.Backend):
prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform})
p = ET.SubElement(prjconf, 'Configuration')
- p.text= self.buildtype
+ p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
@@ -941,7 +941,7 @@ class Vs2010Backend(backends.Backend):
kw.text = self.platform + 'Proj'
p = ET.SubElement(globalgroup, 'Platform')
p.text = self.platform
- pname= ET.SubElement(globalgroup, 'ProjectName')
+ pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.Default.props')
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
@@ -1010,7 +1010,7 @@ if %%errorlevel%% neq 0 goto :VCEnd'''
prjconf = ET.SubElement(confitems, 'ProjectConfiguration',
{'Include': self.buildtype + '|' + self.platform})
p = ET.SubElement(prjconf, 'Configuration')
- p.text= self.buildtype
+ p.text = self.buildtype
pl = ET.SubElement(prjconf, 'Platform')
pl.text = self.platform
globalgroup = ET.SubElement(root, 'PropertyGroup', Label='Globals')
@@ -1019,8 +1019,8 @@ if %%errorlevel%% neq 0 goto :VCEnd'''
kw = ET.SubElement(globalgroup, 'Keyword')
kw.text = self.platform + 'Proj'
p = ET.SubElement(globalgroup, 'Platform')
- p.text= self.platform
- pname= ET.SubElement(globalgroup, 'ProjectName')
+ p.text = self.platform
+ pname = ET.SubElement(globalgroup, 'ProjectName')
pname.text = project_name
ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.Default.props')
type_config = ET.SubElement(root, 'PropertyGroup', Label='Configuration')
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index 03efaf9..77eb2ef 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -186,35 +186,35 @@ class XCodeBackend(backends.Backend):
def generate_pbx_aggregate_target(self):
self.ofile.write('\n/* Begin PBXAggregateTarget section */\n')
self.write_line('%s /* ALL_BUILD */ = {' % self.all_id)
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXAggregateTarget;')
self.write_line('buildConfigurationList = %s;' % self.all_buildconf_id)
self.write_line('buildPhases = (')
self.write_line(');')
self.write_line('dependencies = (')
- self.indent_level+=1
+ self.indent_level += 1
for t in self.build.targets:
self.write_line('%s /* PBXTargetDependency */,' % self.pbx_dep_map[t])
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('name = ALL_BUILD;')
self.write_line('productName = ALL_BUILD;')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.write_line('%s /* RUN_TESTS */ = {' % self.test_id)
- self.indent_level +=1
+ self.indent_level += 1
self.write_line('isa = PBXAggregateTarget;')
self.write_line('buildConfigurationList = %s;' % self.test_buildconf_id)
self.write_line('buildPhases = (')
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('%s /* test run command */,' % self.test_command_id)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('dependencies = (')
self.write_line(');')
self.write_line('name = RUN_TESTS;')
self.write_line('productName = RUN_TESTS;')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End PBXAggregateTarget section */\n')
@@ -270,7 +270,7 @@ class XCodeBackend(backends.Backend):
self.write_line('proxyType = 1;')
self.write_line('remoteGlobalIDString = %s;' % self.native_targets[t])
self.write_line('remoteInfo = "%s";' % t)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End PBXContainerItemProxy section */\n')
@@ -311,14 +311,14 @@ class XCodeBackend(backends.Backend):
resources_id = self.gen_id()
products_id = self.gen_id()
self.write_line('%s = {' % self.maingroup_id)
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXGroup;')
self.write_line('children = (')
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('%s /* Sources */,' % sources_id)
self.write_line('%s /* Resources */,' % resources_id)
self.write_line('%s /* Products */,' % products_id)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('sourceTree = "<group>";')
self.indent_level -= 1
@@ -326,48 +326,48 @@ class XCodeBackend(backends.Backend):
# Sources
self.write_line('%s /* Sources */ = {' % sources_id)
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXGroup;')
self.write_line('children = (')
- self.indent_level+=1
+ self.indent_level += 1
for t in self.build.targets:
self.write_line('%s /* %s */,' % (groupmap[t], t))
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('name = Sources;')
self.write_line('sourcetree = "<group>";')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.write_line('%s /* Resources */ = {' % resources_id)
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXGroup;')
self.write_line('children = (')
self.write_line(');')
self.write_line('name = Resources;')
self.write_line('sourceTree = "<group>";')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
# Targets
for t in self.build.targets:
self.write_line('%s /* %s */ = {' % (groupmap[t], t))
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXGroup;')
self.write_line('children = (')
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('%s /* Source files */,' % target_src_map[t])
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('name = "%s";' % t)
self.write_line('sourceTree = "<group>";')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.write_line('%s /* Source files */ = {' % target_src_map[t])
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXGroup;')
self.write_line('children = (')
- self.indent_level+=1
+ self.indent_level += 1
for s in self.build.targets[t].sources:
s = os.path.join(s.subdir, s.fname)
if isinstance(s, str):
@@ -375,26 +375,26 @@ class XCodeBackend(backends.Backend):
for o in self.build.targets[t].objects:
o = os.path.join(self.build.targets[t].subdir, o)
self.write_line('%s /* %s */,' % (self.filemap[o], o))
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('name = "Source files";')
self.write_line('sourceTree = "<group>";')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
# And finally products
self.write_line('%s /* Products */ = {' % products_id)
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXGroup;')
self.write_line('children = (')
- self.indent_level+=1
+ self.indent_level += 1
for t in self.build.targets:
self.write_line('%s /* %s */,' % (self.target_filemap[t], t))
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('name = Products;')
self.write_line('sourceTree = "<group>";')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End PBXGroup section */\n')
@@ -403,25 +403,25 @@ class XCodeBackend(backends.Backend):
for tname, idval in self.native_targets.items():
t = self.build.targets[tname]
self.write_line('%s /* %s */ = {' % (idval, tname))
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXNativeTarget;')
self.write_line('buildConfigurationList = %s /* Build configuration list for PBXNativeTarget "%s" */;'\
% (self.buildconflistmap[tname], tname))
self.write_line('buildPhases = (')
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('%s /* Sources */,' % self.buildphasemap[tname])
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('buildRules = (')
self.write_line(');')
self.write_line('dependencies = (')
- self.indent_level+=1
+ self.indent_level += 1
for lt in self.build.targets[tname].link_targets:
# NOT DOCUMENTED, may need to make different links
# to same target have different targetdependency item.
idval = self.pbx_dep_map[lt.get_id()]
self.write_line('%s /* PBXTargetDependency */,' % idval)
- self.indent_level -=1
+ self.indent_level -= 1
self.write_line(");")
self.write_line('name = "%s";' % tname)
self.write_line('productName = "%s";' % tname)
@@ -435,7 +435,7 @@ class XCodeBackend(backends.Backend):
else:
raise MesonException('Unknown target type for %s' % tname)
self.write_line('productType = "%s";' % typestr)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End PBXNativeTarget section */\n')
@@ -496,7 +496,7 @@ class XCodeBackend(backends.Backend):
cmdstr = ' '.join(["'%s'" % i for i in cmd])
self.write_line('shellScript = "%s";' % cmdstr)
self.write_line('showEnvVarsInLog = 0;')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End PBXShellScriptBuildPhase section */\n')
@@ -504,19 +504,19 @@ class XCodeBackend(backends.Backend):
self.ofile.write('\n/* Begin PBXSourcesBuildPhase section */\n')
for name, phase_id in self.source_phase.items():
self.write_line('%s /* Sources */ = {' % self.buildphasemap[name])
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = PBXSourcesBuildPhase;')
self.write_line('buildActionMask = 2147483647;')
self.write_line('files = (')
- self.indent_level+=1
+ self.indent_level += 1
for s in self.build.targets[name].sources:
s = os.path.join(s.subdir, s.fname)
if not self.environment.is_header(s):
self.write_line('%s /* %s */,' % (self.buildmap[s], os.path.join(self.environment.get_source_dir(), s)))
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('runOnlyForDeploymentPostprocessing = 0;')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End PBXSourcesBuildPhase section */\n')
@@ -529,7 +529,7 @@ class XCodeBackend(backends.Backend):
self.write_line('isa = PBXTargetDependency;')
self.write_line('target = %s /* %s */;' % (self.native_targets[t], t))
self.write_line('targetProxy = %s /* PBXContainerItemProxy */;' % self.containerproxy_map[t])
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End PBXTargetDependency section */\n')
@@ -538,24 +538,24 @@ class XCodeBackend(backends.Backend):
# First the setup for the toplevel project.
for buildtype in self.buildtypes:
self.write_line('%s /* %s */ = {' % (self.project_configurations[buildtype], buildtype))
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = XCBuildConfiguration;')
self.write_line('buildSettings = {')
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";')
self.write_line('ONLY_ACTIVE_ARCH = YES;')
self.write_line('SDKROOT = "macosx";')
self.write_line('SYMROOT = "%s/build";' % self.environment.get_build_dir())
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.write_line('name = "%s";' % buildtype)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
# Then the all target.
for buildtype in self.buildtypes:
self.write_line('%s /* %s */ = {' % (self.buildall_configurations[buildtype], buildtype))
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = XCBuildConfiguration;')
self.write_line('buildSettings = {')
self.indent_level += 1
@@ -574,16 +574,16 @@ class XCodeBackend(backends.Backend):
self.write_line('SYMROOT = "%s";' % self.environment.get_build_dir())
self.write_line('USE_HEADERMAP = NO;')
self.write_line('WARNING_CFLAGS = ("-Wmost", "-Wno-four-char-constants", "-Wno-unknown-pragmas", );')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.write_line('name = "%s";' % buildtype)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
# Then the test target.
for buildtype in self.buildtypes:
self.write_line('%s /* %s */ = {' % (self.test_configurations[buildtype], buildtype))
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = XCBuildConfiguration;')
self.write_line('buildSettings = {')
self.indent_level += 1
@@ -602,10 +602,10 @@ class XCodeBackend(backends.Backend):
self.write_line('SYMROOT = "%s";' % self.environment.get_build_dir())
self.write_line('USE_HEADERMAP = NO;')
self.write_line('WARNING_CFLAGS = ("-Wmost", "-Wno-four-char-constants", "-Wno-unknown-pragmas", );')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.write_line('name = "%s";' % buildtype)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
# Now finally targets.
@@ -654,7 +654,7 @@ class XCodeBackend(backends.Backend):
langargs[langnamemap[lang]] = args
symroot = os.path.join(self.environment.get_build_dir(), target.subdir)
self.write_line('%s /* %s */ = {' % (valid, buildtype))
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = XCBuildConfiguration;')
self.write_line('buildSettings = {')
self.indent_level += 1
@@ -689,57 +689,57 @@ class XCodeBackend(backends.Backend):
self.write_line('SYMROOT = "%s";' % symroot)
self.write_line('USE_HEADERMAP = NO;')
self.write_line('WARNING_CFLAGS = ("-Wmost", "-Wno-four-char-constants", "-Wno-unknown-pragmas", );')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.write_line('name = "%s";' % buildtype)
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
self.ofile.write('/* End XCBuildConfiguration section */\n')
def generate_xc_configurationList(self):
self.ofile.write('\n/* Begin XCConfigurationList section */\n')
self.write_line('%s /* Build configuration list for PBXProject "%s" */ = {' % (self.project_conflist, self.build.project_name))
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = XCConfigurationList;')
self.write_line('buildConfigurations = (')
- self.indent_level+=1
+ self.indent_level += 1
for buildtype in self.buildtypes:
self.write_line('%s /* %s */,' % (self.project_configurations[buildtype], buildtype))
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('defaultConfigurationIsVisible = 0;')
self.write_line('defaultConfigurationName = debug;')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
# Now the all target
self.write_line('%s /* Build configuration list for PBXAggregateTarget "ALL_BUILD" */ = {' % self.all_buildconf_id)
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = XCConfigurationList;')
self.write_line('buildConfigurations = (')
- self.indent_level+=1
+ self.indent_level += 1
for buildtype in self.buildtypes:
self.write_line('%s /* %s */,' % (self.buildall_configurations[buildtype], buildtype))
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('defaultConfigurationIsVisible = 0;')
self.write_line('defaultConfigurationName = debug;')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
# Test target
self.write_line('%s /* Build configuration list for PBXAggregateTarget "ALL_BUILD" */ = {' % self.test_buildconf_id)
- self.indent_level+=1
+ self.indent_level += 1
self.write_line('isa = XCConfigurationList;')
self.write_line('buildConfigurations = (')
- self.indent_level+=1
+ self.indent_level += 1
for buildtype in self.buildtypes:
self.write_line('%s /* %s */,' % (self.test_configurations[buildtype], buildtype))
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line(');')
self.write_line('defaultConfigurationIsVisible = 0;')
self.write_line('defaultConfigurationName = debug;')
- self.indent_level-=1
+ self.indent_level -= 1
self.write_line('};')
for target_name in self.build.targets:
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index 0a3f8cb..801dffb 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -1836,7 +1836,7 @@ class DmdDCompiler(DCompiler):
class VisualStudioCCompiler(CCompiler):
std_warn_args = ['/W3']
- std_opt_args= ['/O2']
+ std_opt_args = ['/O2']
def __init__(self, exelist, version, is_cross, exe_wrap):
CCompiler.__init__(self, exelist, version, is_cross, exe_wrap)
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index 376319d..b3bc808 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -158,7 +158,7 @@ def load(filename):
if not isinstance(obj, CoreData):
raise MesonException(load_fail_msg)
if obj.version != version:
- raise MesonException('Build directory has been generated with Meson version %s, which is incompatible with current version %s.\nPlease delete this build directory AND create a new one.'%
+ raise MesonException('Build directory has been generated with Meson version %s, which is incompatible with current version %s.\nPlease delete this build directory AND create a new one.' %
(obj.version, version))
return obj
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index d95f6f9..412242a 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -680,7 +680,7 @@ class Environment():
if evar in os.environ:
linker = os.environ[evar].strip()
elif isinstance(compiler, VisualStudioCCompiler):
- linker= self.vs_static_linker
+ linker = self.vs_static_linker
else:
linker = self.default_static_linker
basename = os.path.basename(linker).lower()
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py
index d660f4c..db694c0 100644
--- a/mesonbuild/interpreterbase.py
+++ b/mesonbuild/interpreterbase.py
@@ -610,7 +610,7 @@ class InterpreterBase:
# @noKwargs
def func_get_variable(self, node, args, kwargs):
- if len(args)<1 or len(args)>2:
+ if len(args) < 1 or len(args) > 2:
raise InvalidCode('Get_variable takes one or two arguments.')
varname = args[0]
if not isinstance(varname, str):
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index 892770c..3c462c7 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -111,11 +111,11 @@ def list_target_files(target_name, coredata, builddata):
print(json.dumps(sources))
def list_buildoptions(coredata, builddata):
- buildtype= {'choices': ['plain', 'debug', 'debugoptimized', 'release', 'minsize'],
- 'type': 'combo',
- 'value': coredata.get_builtin_option('buildtype'),
- 'description': 'Build type',
- 'name': 'type'}
+ buildtype = {'choices': ['plain', 'debug', 'debugoptimized', 'release', 'minsize'],
+ 'type': 'combo',
+ 'value': coredata.get_builtin_option('buildtype'),
+ 'description': 'Build type',
+ 'name': 'type'}
strip = {'value': coredata.get_builtin_option('strip'),
'type': 'boolean',
'description': 'Strip on install',
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 95113a0..b7e5a8c 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -260,9 +260,9 @@ can not be used with the current version of glib-compiled-resources, due to
link_command = ['-l%s' % lib.name]
if isinstance(lib, build.SharedLibrary):
libdir = os.path.join(state.environment.get_build_dir(), lib.subdir)
- link_command += ['-L%s' %libdir]
+ link_command += ['-L%s' % libdir]
if include_rpath:
- link_command += ['-Wl,-rpath %s' %libdir]
+ link_command += ['-Wl,-rpath %s' % libdir]
if depends:
depends.append(lib)
return link_command
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index ad1fedd..17ca3b8 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -177,7 +177,7 @@ class ArrayNode:
class EmptyNode:
def __init__(self):
- self.subdir =''
+ self.subdir = ''
self.lineno = 0
self.colno = 0
self.value = None
diff --git a/mesonbuild/scripts/yelphelper.py b/mesonbuild/scripts/yelphelper.py
index 76366a4..e5b3b11 100644
--- a/mesonbuild/scripts/yelphelper.py
+++ b/mesonbuild/scripts/yelphelper.py
@@ -65,7 +65,7 @@ def install_help(srcdir, blddir, sources, media, langs, install_dir, destdir, pr
for source in sources:
infile = os.path.join(srcdir if lang == 'C' else blddir, lang, source)
outfile = os.path.join(indir, source)
- mlog.log('Installing %s to %s.' %(infile, outfile))
+ mlog.log('Installing %s to %s.' % (infile, outfile))
shutil.copyfile(infile, outfile)
shutil.copystat(infile, outfile)
for m in media:
@@ -73,15 +73,15 @@ def install_help(srcdir, blddir, sources, media, langs, install_dir, destdir, pr
outfile = os.path.join(indir, m)
if not os.path.exists(infile):
if lang == 'C':
- mlog.warning('Media file "%s" did not exist in C directory' %m)
+ mlog.warning('Media file "%s" did not exist in C directory' % m)
elif symlinks:
srcfile = os.path.join(c_install_dir, m)
- mlog.log('Symlinking %s to %s.' %(outfile, srcfile))
+ mlog.log('Symlinking %s to %s.' % (outfile, srcfile))
if '/' in m or '\\' in m:
os.makedirs(os.path.dirname(outfile), exist_ok=True)
os.symlink(srcfile, outfile)
continue
- mlog.log('Installing %s to %s.' %(infile, outfile))
+ mlog.log('Installing %s to %s.' % (infile, outfile))
if '/' in m or '\\' in m:
os.makedirs(os.path.dirname(outfile), exist_ok=True)
shutil.copyfile(infile, outfile)