Whitespace tweaks to reduce Flake8 warnings

pull/1835/head
Alistair Thomas 7 years ago committed by Jussi Pakkanen
parent 4abef5ce23
commit a195b78c8d
  1. 1
      mesonbuild/backend/backends.py
  2. 4
      mesonbuild/backend/ninjabackend.py
  3. 1
      mesonbuild/backend/vs2015backend.py
  4. 6
      mesonbuild/backend/xcodebackend.py
  5. 6
      mesonbuild/build.py
  6. 2
      mesonbuild/mesonmain.py
  7. 2
      mesonbuild/scripts/depfixer.py
  8. 4
      mesonbuild/scripts/dist.py
  9. 2
      mesonbuild/wrap/wrap.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,

@ -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):

@ -21,4 +21,3 @@ class Vs2015Backend(Vs2010Backend):
self.name = 'vs2015'
self.platform_toolset = 'v140'
self.vs_version = '2015'

@ -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')

@ -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 = ''

@ -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')

@ -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:

@ -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, )

@ -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.')

Loading…
Cancel
Save