Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2357 from LukeShu/flake8 

Bring into compliance with flake8
This commit is contained in:
Jussi Pakkanen 2017-09-22 21:33:34 +03:00 committed by GitHub
parent 2ab4b397a8 68d4c1e559
commit be0aa7fd74
22 changed files with 119 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mesonbuild/backend/ninjabackend.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import os, pickle, re, shlex, shutil, subprocess, sys import os, pickle, re, shlex, subprocess, sys
from collections import OrderedDict from collections import OrderedDict
from . import backends from . import backends
@ -83,8 +83,7 @@ class NinjaBuildElement:
def write(self, outfile): def write(self, outfile):
self.check_outputs() self.check_outputs()
line = 'build %s: %s %s' % ( line = 'build %s: %s %s' % (' '.join([ninja_quote(i) for i in self.outfilenames]),
' '.join([ninja_quote(i) for i in self.outfilenames]),
self.rule, self.rule,
' '.join([ninja_quote(i) for i in self.infilenames])) ' '.join([ninja_quote(i) for i in self.infilenames]))
if len(self.deps) > 0: if len(self.deps) > 0:
@ -721,8 +720,7 @@ int dummy;
# On toolchains/platforms that use an import library for # On toolchains/platforms that use an import library for
# linking (separate from the shared library with all the # linking (separate from the shared library with all the
# code), we need to install that too (dll.a/.lib). # code), we need to install that too (dll.a/.lib).
if (isinstance(t, build.SharedLibrary) or if (isinstance(t, build.SharedLibrary) or isinstance(t, build.Executable)) and t.get_import_filename():
isinstance(t, build.Executable)) and t.get_import_filename():
if custom_install_dir: if custom_install_dir:
# If the DLL is installed into a custom directory, # If the DLL is installed into a custom directory,
# install the import library into the same place so # install the import library into the same place so
@ -856,7 +854,8 @@ int dummy;
self.create_target_alias('meson-test', outfile) self.create_target_alias('meson-test', outfile)
# And then benchmarks. # And then benchmarks.
cmd = self.environment.get_build_command(True) + ['test', '--benchmark', '--logbase', cmd = self.environment.get_build_command(True) + [
'test', '--benchmark', '--logbase',
'benchmarklog', '--num-processes=1', '--no-rebuild'] 'benchmarklog', '--num-processes=1', '--no-rebuild']
elem = NinjaBuildElement(self.all_outputs, 'meson-benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem = NinjaBuildElement(self.all_outputs, 'meson-benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY'])
elem.add_item('COMMAND', cmd) elem.add_item('COMMAND', cmd)
@ -1578,7 +1577,8 @@ int dummy;
full_exe = [ninja_quote(x) for x in self.environment.get_build_command()] + [ full_exe = [ninja_quote(x) for x in self.environment.get_build_command()] + [
'--internal', '--internal',
'dirchanger', 'dirchanger',
'$RUNDIR'] '$RUNDIR',
]
invoc = (' '.join(full_exe) + ' ' + invoc = (' '.join(full_exe) + ' ' +
' '.join(ninja_quote(i) for i in compiler.get_exelist())) ' '.join(ninja_quote(i) for i in compiler.get_exelist()))
command = ' command = %s $ARGS $in\n' % invoc command = ' command = %s $ARGS $in\n' % invoc
@ -2527,10 +2527,11 @@ rule FORTRAN_DEP_HACK
def generate_dist(self, outfile): def generate_dist(self, outfile):
elem = NinjaBuildElement(self.all_outputs, 'meson-dist', 'CUSTOM_COMMAND', 'PHONY') elem = NinjaBuildElement(self.all_outputs, 'meson-dist', 'CUSTOM_COMMAND', 'PHONY')
elem.add_item('DESC', 'Creating source packages') elem.add_item('DESC', 'Creating source packages')
elem.add_item('COMMAND', self.environment.get_build_command() + elem.add_item('COMMAND', self.environment.get_build_command() + [
['--internal', 'dist', '--internal', 'dist',
self.environment.source_dir, self.environment.source_dir,
self.environment.build_dir] + self.environment.get_build_command()) self.environment.build_dir,
] + self.environment.get_build_command())
elem.add_item('pool', 'console') elem.add_item('pool', 'console')
elem.write(outfile) elem.write(outfile)
# Alias that runs the target defined above # Alias that runs the target defined above

7
mesonbuild/backend/vs2010backend.py
View File

@ -22,7 +22,6 @@ from .. import build
from .. import dependencies from .. import dependencies
from .. import mlog from .. import mlog
from .. import compilers from .. import compilers
from ..build import BuildTarget
from ..compilers import CompilerArgs from ..compilers import CompilerArgs
from ..mesonlib import MesonException, File from ..mesonlib import MesonException, File
from ..environment import Environment from ..environment import Environment
@ -383,8 +382,7 @@ class Vs2010Backend(backends.Backend):
cmd = [sys.executable, os.path.join(self.environment.get_script_dir(), 'commandrunner.py'), cmd = [sys.executable, os.path.join(self.environment.get_script_dir(), 'commandrunner.py'),
self.environment.get_build_dir(), self.environment.get_build_dir(),
self.environment.get_source_dir(), self.environment.get_source_dir(),
self.get_target_dir(target)] + \ self.get_target_dir(target)] + self.environment.get_build_command()
self.environment.get_build_command()
for i in cmd_raw: for i in cmd_raw:
if isinstance(i, build.BuildTarget): if isinstance(i, build.BuildTarget):
cmd.append(os.path.join(self.environment.get_build_dir(), self.get_target_filename(i))) cmd.append(os.path.join(self.environment.get_build_dir(), self.get_target_filename(i)))
@ -926,8 +924,7 @@ class Vs2010Backend(backends.Backend):
ofile.text = '$(OutDir)%s' % target.get_filename() ofile.text = '$(OutDir)%s' % target.get_filename()
subsys = ET.SubElement(link, 'SubSystem') subsys = ET.SubElement(link, 'SubSystem')
subsys.text = subsystem subsys.text = subsystem
if (isinstance(target, build.SharedLibrary) or if (isinstance(target, build.SharedLibrary) or isinstance(target, build.Executable)) and target.get_import_filename():
isinstance(target, build.Executable)) and target.get_import_filename():
# DLLs built with MSVC always have an import library except when # DLLs built with MSVC always have an import library except when
# they're data-only DLLs, but we don't support those yet. # they're data-only DLLs, but we don't support those yet.
ET.SubElement(link, 'ImportLibrary').text = target.get_import_filename() ET.SubElement(link, 'ImportLibrary').text = target.get_import_filename()

2
mesonbuild/compilers/c.py
View File

@ -1025,5 +1025,3 @@ class VisualStudioCCompiler(CCompiler):
# and the can not be called. # and the can not be called.
return None return None
return vs32_instruction_set_args.get(instruction_set, None) return vs32_instruction_set_args.get(instruction_set, None)

2
mesonbuild/compilers/compilers.py
View File

@ -252,7 +252,7 @@ vs32_instruction_set_args = {'mmx': ['/arch:SSE'], # There does not seem to be a
'avx': ['/arch:AVX'], 'avx': ['/arch:AVX'],
'avx2': ['/arch:AVX2'], 'avx2': ['/arch:AVX2'],
'neon': None, 'neon': None,
} }
# The 64 bit compiler defaults to /arch:avx. # The 64 bit compiler defaults to /arch:avx.
vs64_instruction_set_args = {'mmx': ['/arch:AVX'], vs64_instruction_set_args = {'mmx': ['/arch:AVX'],

11
mesonbuild/interpreter.py
View File

@ -1028,7 +1028,6 @@ class CompilerHolder(InterpreterObject):
h) h)
return result return result
def first_supported_argument_method(self, args, kwargs): def first_supported_argument_method(self, args, kwargs):
for i in mesonlib.stringlistify(args): for i in mesonlib.stringlistify(args):
if self.compiler.has_argument(i, self.environment): if self.compiler.has_argument(i, self.environment):
@ -1245,7 +1244,8 @@ class MesonMain(InterpreterObject):
pch_kwargs = set(['c_pch', 'cpp_pch']) pch_kwargs = set(['c_pch', 'cpp_pch'])
lang_arg_kwargs = set(['c_args', lang_arg_kwargs = set([
'c_args',
'cpp_args', 'cpp_args',
'd_args', 'd_args',
'd_import_dirs', 'd_import_dirs',
@ -1258,13 +1258,14 @@ lang_arg_kwargs = set(['c_args',
'rust_args', 'rust_args',
'vala_args', 'vala_args',
'cs_args', 'cs_args',
]) ])
vala_kwargs = set(['vala_header', 'vala_gir', 'vala_vapi']) vala_kwargs = set(['vala_header', 'vala_gir', 'vala_vapi'])
rust_kwargs = set(['rust_crate_type']) rust_kwargs = set(['rust_crate_type'])
cs_kwargs = set(['resources', 'cs_args']) cs_kwargs = set(['resources', 'cs_args'])
buildtarget_kwargs = set(['build_by_default', buildtarget_kwargs = set([
'build_by_default',
'build_rpath', 'build_rpath',
'dependencies', 'dependencies',
'extra_files', 'extra_files',
@ -1286,7 +1287,7 @@ buildtarget_kwargs = set(['build_by_default',
'pic', 'pic',
'sources', 'sources',
'vs_module_defs', 'vs_module_defs',
]) ])
build_target_common_kwargs = ( build_target_common_kwargs = (
buildtarget_kwargs | buildtarget_kwargs |

1
mesonbuild/modules/__init__.py
View File

@ -4,7 +4,6 @@ from .. import build
from .. import dependencies from .. import dependencies
from .. import mlog from .. import mlog
from ..mesonlib import MesonException from ..mesonlib import MesonException
from ..interpreterbase import permittedKwargs, noKwargs
class permittedSnippetKwargs: class permittedSnippetKwargs:

25
mesonbuild/modules/gnome.py
View File

@ -17,7 +17,6 @@ functionality such as gobject-introspection, gresources and gtk-doc'''
from .. import build from .. import build
import os import os
import sys
import copy import copy
import subprocess import subprocess
from . import ModuleReturnValue from . import ModuleReturnValue
@ -30,7 +29,7 @@ from .. import interpreter
from . import GResourceTarget, GResourceHeaderTarget, GirTarget, TypelibTarget, VapiTarget from . import GResourceTarget, GResourceHeaderTarget, GirTarget, TypelibTarget, VapiTarget
from . import find_program, get_include_args from . import find_program, get_include_args
from . import ExtensionModule from . import ExtensionModule
from . import noKwargs, permittedKwargs from ..interpreterbase import noKwargs, permittedKwargs
# gresource compilation is broken due to the way # gresource compilation is broken due to the way
# the resource compiler and Ninja clash about it # the resource compiler and Ninja clash about it
@ -697,18 +696,22 @@ This will become a hard error in the future.''')
args.append('--langs=' + '@@'.join(langs)) args.append('--langs=' + '@@'.join(langs))
inscript = build.RunScript(script, args) inscript = build.RunScript(script, args)
potargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'pot', potargs = state.environment.get_build_command() + [
'--subdir=' + state.subdir, '--internal', 'yelphelper', 'pot',
'--id=' + project_id,
'--sources=' + source_str]
pottarget = build.RunTarget('help-' + project_id + '-pot', potargs[0],
potargs[1:], [], state.subdir)
poargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'update-po',
'--subdir=' + state.subdir, '--subdir=' + state.subdir,
'--id=' + project_id, '--id=' + project_id,
'--sources=' + source_str, '--sources=' + source_str,
'--langs=' + '@@'.join(langs)] ]
pottarget = build.RunTarget('help-' + project_id + '-pot', potargs[0],
potargs[1:], [], state.subdir)
poargs = state.environment.get_build_command() + [
'--internal', 'yelphelper', 'update-po',
'--subdir=' + state.subdir,
'--id=' + project_id,
'--sources=' + source_str,
'--langs=' + '@@'.join(langs),
]
potarget = build.RunTarget('help-' + project_id + '-update-po', poargs[0], potarget = build.RunTarget('help-' + project_id + '-update-po', poargs[0],
poargs[1:], [], state.subdir) poargs[1:], [], state.subdir)

9
mesonbuild/modules/i18n.py
View File

@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import sys
import shutil import shutil
from os import path from os import path
@ -20,7 +19,7 @@ from .. import coredata, mesonlib, build
from ..mesonlib import MesonException from ..mesonlib import MesonException
from . import ModuleReturnValue from . import ModuleReturnValue
from . import ExtensionModule from . import ExtensionModule
from . import permittedKwargs from ..interpreterbase import permittedKwargs
PRESET_ARGS = { PRESET_ARGS = {
'glib': [ 'glib': [
@ -72,8 +71,10 @@ class I18nModule(ExtensionModule):
datadirs = self._get_data_dirs(state, mesonlib.stringlistify(kwargs.pop('data_dirs', []))) datadirs = self._get_data_dirs(state, mesonlib.stringlistify(kwargs.pop('data_dirs', [])))
datadirs = '--datadirs=' + ':'.join(datadirs) if datadirs else None datadirs = '--datadirs=' + ':'.join(datadirs) if datadirs else None
command = state.environment.get_build_command() + ['--internal', 'msgfmthelper', command = state.environment.get_build_command() + [
'@INPUT@', '@OUTPUT@', file_type, podir] '--internal', 'msgfmthelper',
'@INPUT@', '@OUTPUT@', file_type, podir
]
if datadirs: if datadirs:
command.append(datadirs) command.append(datadirs)

2
mesonbuild/modules/modtest.py
View File

@ -14,7 +14,7 @@
from . import ModuleReturnValue from . import ModuleReturnValue
from . import ExtensionModule from . import ExtensionModule
from . import noKwargs from ..interpreterbase import noKwargs
class TestModule(ExtensionModule): class TestModule(ExtensionModule):

2
mesonbuild/modules/pkgconfig.py
View File

@ -19,7 +19,7 @@ from .. import mesonlib
from .. import mlog from .. import mlog
from . import ModuleReturnValue from . import ModuleReturnValue
from . import ExtensionModule from . import ExtensionModule
from . import permittedKwargs from ..interpreterbase import permittedKwargs
class PkgConfigModule(ExtensionModule): class PkgConfigModule(ExtensionModule):

3
mesonbuild/modules/python3.py
View File

@ -18,7 +18,8 @@ from .. import mesonlib, dependencies
from . import ExtensionModule from . import ExtensionModule
from mesonbuild.modules import ModuleReturnValue from mesonbuild.modules import ModuleReturnValue
from . import noKwargs, permittedSnippetKwargs from . import permittedSnippetKwargs
from ..interpreterbase import noKwargs
from ..interpreter import shlib_kwargs from ..interpreter import shlib_kwargs
mod_kwargs = set() mod_kwargs = set()

2
mesonbuild/modules/qt4.py
View File

@ -20,7 +20,7 @@ from ..dependencies import Qt4Dependency
from . import ExtensionModule from . import ExtensionModule
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from . import ModuleReturnValue from . import ModuleReturnValue
from . import permittedKwargs from ..interpreterbase import permittedKwargs
class Qt4Module(ExtensionModule): class Qt4Module(ExtensionModule):
tools_detected = False tools_detected = False

2
mesonbuild/modules/qt5.py
View File

@ -20,7 +20,7 @@ from ..dependencies import Qt5Dependency
from . import ExtensionModule from . import ExtensionModule
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from . import ModuleReturnValue from . import ModuleReturnValue
from . import permittedKwargs from ..interpreterbase import permittedKwargs
class Qt5Module(ExtensionModule): class Qt5Module(ExtensionModule):
tools_detected = False tools_detected = False

2
mesonbuild/modules/rpm.py
View File

@ -22,7 +22,7 @@ from .. import mlog
from . import GirTarget, TypelibTarget from . import GirTarget, TypelibTarget
from . import ModuleReturnValue from . import ModuleReturnValue
from . import ExtensionModule from . import ExtensionModule
from . import noKwargs from ..interpreterbase import noKwargs
import os import os

2
mesonbuild/modules/windows.py
View File

@ -20,7 +20,7 @@ from ..mesonlib import MesonException, extract_as_list
from . import get_include_args from . import get_include_args
from . import ModuleReturnValue from . import ModuleReturnValue
from . import ExtensionModule from . import ExtensionModule
from . import permittedKwargs from ..interpreterbase import permittedKwargs
class WindowsModule(ExtensionModule): class WindowsModule(ExtensionModule):

2
mesonbuild/wrap/wrap.py
View File

@ -299,7 +299,7 @@ class Resolver:
def extract_package(self, package): def extract_package(self, package):
if sys.version_info < (3, 5): if sys.version_info < (3, 5):
try: try:
import lzma import lzma # noqa: F401
del lzma del lzma
except ImportError: except ImportError:
pass pass

3
mesonrewriter.py
View File

@ -23,11 +23,10 @@
# - move targets # - move targets
# - reindent? # - reindent?
from mesonbuild import mesonmain, mlog from mesonbuild import mesonmain
import sys import sys
if __name__ == '__main__': if __name__ == '__main__':
print('Warning: This executable is deprecated. Use "meson rewrite" instead.', print('Warning: This executable is deprecated. Use "meson rewrite" instead.',
file=sys.stderr) file=sys.stderr)
sys.exit(mesonmain.run(['rewrite'] + sys.argv[1:])) sys.exit(mesonmain.run(['rewrite'] + sys.argv[1:]))

8
msi/createmsi.py
View File

@ -135,11 +135,12 @@ class PackageGenerator:
'Name': 'SourceDir', 'Name': 'SourceDir',
}) })
progfiledir = ET.SubElement(targetdir, 'Directory', { progfiledir = ET.SubElement(targetdir, 'Directory', {
'Id' : self.progfile_dir, 'Id': self.progfile_dir,
}) })
installdir = ET.SubElement(progfiledir, 'Directory', { installdir = ET.SubElement(progfiledir, 'Directory', {
'Id': 'INSTALLDIR', 'Id': 'INSTALLDIR',
'Name': 'Meson'}) 'Name': 'Meson',
})
ET.SubElement(product, 'Property', { ET.SubElement(product, 'Property', {
'Id': 'WIXUI_INSTALLDIR', 'Id': 'WIXUI_INSTALLDIR',
@ -165,7 +166,7 @@ class PackageGenerator:
nodes[root] = cur_node nodes[root] = cur_node
self.create_xml(nodes, sd, installdir, sd) self.create_xml(nodes, sd, installdir, sd)
self.build_features(nodes, top_feature, sd) self.build_features(nodes, top_feature, sd)
ET.ElementTree(self.root).write(self.main_xml, encoding='utf-8',xml_declaration=True) ET.ElementTree(self.root).write(self.main_xml, encoding='utf-8', xml_declaration=True)
# ElementTree can not do prettyprinting so do it manually # ElementTree can not do prettyprinting so do it manually
import xml.dom.minidom import xml.dom.minidom
doc = xml.dom.minidom.parse(self.main_xml) doc = xml.dom.minidom.parse(self.main_xml)
@ -179,7 +180,6 @@ class PackageGenerator:
'Id': component_id, 'Id': component_id,
}) })
def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir): def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
cur_node = nodes[current_dir] cur_node = nodes[current_dir]
if cur_node.files: if cur_node.files:

2
run_unittests.py
View File

@ -1946,7 +1946,7 @@ cpu = 'armv7' # Not sure if correct.
endian = 'little' endian = 'little'
''' % os.path.join(testdir, 'some_cross_tool.py')) ''' % os.path.join(testdir, 'some_cross_tool.py'))
crossfile.flush() crossfile.flush()
self.init(testdir, ['--cross-file='+crossfile.name]) self.init(testdir, ['--cross-file=' + crossfile.name])
def test_reconfigure(self): def test_reconfigure(self):
testdir = os.path.join(self.unit_test_dir, '13 reconfigure') testdir = os.path.join(self.unit_test_dir, '13 reconfigure')

8
setup.cfg
View File

@ -14,8 +14,10 @@ ignore =
E305, E305,
# E401: multiple imports on one line # E401: multiple imports on one line
E401, E401,
# too many leading '#' for block comment # E266: too many leading '#' for block comment
E266, E266,
# module level import not at top of file # E402: module level import not at top of file
E402 E402,
# E731: do not assign a lambda expression, use a def (too many false positives)
E731
max-line-length = 120 max-line-length = 120

4
test cases/common/147 mesonintrospect from scripts/check_env.py
View File

@ -16,8 +16,8 @@ mesonintrospect = os.environ['MESONINTROSPECT']
introspect_arr = shlex.split(mesonintrospect) introspect_arr = shlex.split(mesonintrospect)
#print(mesonintrospect) # print(mesonintrospect)
#print(introspect_arr) # print(introspect_arr)
some_executable = introspect_arr[0] some_executable = introspect_arr[0]