aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Thomas <astavale@yahoo.co.uk>2017-05-27 13:43:33 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-05-29 19:32:47 +0300
commita195b78c8ded169f180d8bd6b437f52d47ce7bae (patch)
tree97e674c6ae47c5ed1ac68325d40dcc4b0330d371
parent4abef5ce2335b32e3ec75ffe06dc9af5c9942893 (diff)
downloadmeson-a195b78c8ded169f180d8bd6b437f52d47ce7bae.zip
meson-a195b78c8ded169f180d8bd6b437f52d47ce7bae.tar.gz
meson-a195b78c8ded169f180d8bd6b437f52d47ce7bae.tar.bz2
Whitespace tweaks to reduce Flake8 warnings
-rw-r--r--mesonbuild/backend/backends.py1
-rw-r--r--mesonbuild/backend/ninjabackend.py4
-rw-r--r--mesonbuild/backend/vs2015backend.py1
-rw-r--r--mesonbuild/backend/xcodebackend.py6
-rw-r--r--mesonbuild/build.py6
-rw-r--r--mesonbuild/mesonmain.py2
-rw-r--r--mesonbuild/scripts/depfixer.py2
-rw-r--r--mesonbuild/scripts/dist.py4
-rw-r--r--mesonbuild/wrap/wrap.py2
9 files changed, 13 insertions, 15 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 75974a5..4cfdd9e 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -629,7 +629,6 @@ class Backend:
return True
return False
-
def get_custom_target_sources(self, target):
'''
Custom target sources can be of various object types; strings, File,
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 8ab57ea..6bd9633 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1989,7 +1989,7 @@ rule FORTRAN_DEP_HACK
rel_src = os.path.join(src.subdir, src.fname)
if os.path.isabs(rel_src):
assert(rel_src.startswith(self.environment.get_build_dir()))
- rel_src = rel_src[len(self.environment.get_build_dir())+1:]
+ rel_src = rel_src[len(self.environment.get_build_dir()) + 1:]
abs_src = os.path.join(self.environment.get_build_dir(), rel_src)
elif isinstance(src, mesonlib.File):
rel_src = src.rel_to_builddir(self.build_to_src)
@@ -2008,7 +2008,7 @@ rule FORTRAN_DEP_HACK
src_filename = os.path.join(src.subdir, src.fname)
if os.path.isabs(src_filename):
assert(src_filename.startswith(self.environment.get_build_dir()))
- src_filename = src_filename[len(self.environment.get_build_dir())+1:]
+ src_filename = src_filename[len(self.environment.get_build_dir()) + 1:]
else:
src_filename = src.fname
elif os.path.isabs(src):
diff --git a/mesonbuild/backend/vs2015backend.py b/mesonbuild/backend/vs2015backend.py
index eb543ee..29b33fb 100644
--- a/mesonbuild/backend/vs2015backend.py
+++ b/mesonbuild/backend/vs2015backend.py
@@ -21,4 +21,3 @@ class Vs2015Backend(Vs2010Backend):
self.name = 'vs2015'
self.platform_toolset = 'v140'
self.vs_version = '2015'
-
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index 35c0d84..c48fb07 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -335,16 +335,16 @@ class XCodeBackend(backends.Backend):
for tname, t in self.build.targets.items():
self.ofile.write('\n/* Begin PBXFrameworksBuildPhase section */\n')
self.indent_level += 1
- self.write_line('%s /* %s */ = {\n' %(t.buildphasemap['Frameworks'], 'Frameworks'))
+ self.write_line('%s /* %s */ = {\n' % (t.buildphasemap['Frameworks'], 'Frameworks'))
self.indent_level += 1
self.write_line('isa = PBXFrameworksBuildPhase;\n')
- self.write_line('buildActionMask = %s;\n' %(2147483647))
+ self.write_line('buildActionMask = %s;\n' % (2147483647))
self.write_line('files = (\n')
self.indent_level += 1
for dep in t.get_external_deps():
if isinstance(dep, dependencies.AppleFrameworks):
for f in dep.frameworks:
- self.write_line('%s /* %s.framework in Frameworks */,\n' %(self.native_frameworks[f], f))
+ self.write_line('%s /* %s.framework in Frameworks */,\n' % (self.native_frameworks[f], f))
self.indent_level -= 1
self.write_line(');\n')
self.write_line('runOnlyForDeploymentPostprocessing = 0;\n')
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 2426417..eb1b826 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -633,11 +633,11 @@ class BuildTarget(Target):
self.add_compiler_args('vala', valalist)
objclist = kwargs.get('objc_args', [])
if not isinstance(objclist, list):
- objclist = [objclist]
+ objclist = [objclist]
self.add_compiler_args('objc', objclist)
objcpplist = kwargs.get('objcpp_args', [])
if not isinstance(objcpplist, list):
- objcpplist = [objcpplist]
+ objcpplist = [objcpplist]
self.add_compiler_args('objcpp', objcpplist)
fortranlist = kwargs.get('fortran_args', [])
if not isinstance(fortranlist, list):
@@ -1101,7 +1101,7 @@ class Executable(BuildTarget):
if not hasattr(self, 'suffix'):
# Executable for Windows or C#/Mono
if (for_windows(is_cross, environment) or
- for_cygwin(is_cross, environment) or 'cs' in self.compilers):
+ for_cygwin(is_cross, environment) or 'cs' in self.compilers):
self.suffix = 'exe'
else:
self.suffix = ''
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 70f4027..dacc478 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -68,7 +68,7 @@ parser.add_argument('-D', action='append', dest='projectoptions', default=[], me
help='Set the value of an option, can be used several times to set multiple options.')
parser.add_argument('-v', '--version', action='version',
version=coredata.version)
- # See the mesonlib.WrapMode enum for documentation
+# See the mesonlib.WrapMode enum for documentation
parser.add_argument('--wrap-mode', default=WrapMode.default,
type=lambda t: getattr(WrapMode, t), choices=WrapMode,
help='Special wrap mode to use')
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 2de50ba..1169b7e 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -103,7 +103,7 @@ class SectionHeader(DataSizes):
self.sh_addralign = struct.unpack(self.XWord, ifile.read(self.XWordSize))[0]
else:
self.sh_addralign = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
-#Elf64_Xword
+# Elf64_Xword
if is_64:
self.sh_entsize = struct.unpack(self.XWord, ifile.read(self.XWordSize))[0]
else:
diff --git a/mesonbuild/scripts/dist.py b/mesonbuild/scripts/dist.py
index 064708e..325a882 100644
--- a/mesonbuild/scripts/dist.py
+++ b/mesonbuild/scripts/dist.py
@@ -83,8 +83,8 @@ def create_dist(dist_name, src_root, bld_root, dist_sub):
with tarfile.open(xzname, 'w:xz') as tf:
tf.add(distdir, os.path.split(distdir)[1])
# Create only .tar.xz for now.
- #zipname = distdir + '.zip'
- #create_zip(zipname, distdir)
+ # zipname = distdir + '.zip'
+ # create_zip(zipname, distdir)
shutil.rmtree(distdir)
return (xzname, )
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index af90daa..ac84d0e 100644
--- a/mesonbuild/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
@@ -50,7 +50,7 @@ def open_wrapdburl(urlstring):
global ssl_warning_printed
if has_ssl:
try:
- return urllib.request.urlopen(urlstring)#, context=build_ssl_context())
+ return urllib.request.urlopen(urlstring)# , context=build_ssl_context())
except urllib.error.URLError:
if not ssl_warning_printed:
print('SSL connection failed. Falling back to unencrypted connections.')