aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-05-13 10:36:58 -0400
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-06 20:02:37 +0000
commitaa879b7f0cd3ed36e87ee7699e060c48d66f6b67 (patch)
treecdb21419a6e2c99578b5086c557650e97d7936c4
parentb7d442150dd8575f0756e3bc9e953d0f198e16c6 (diff)
downloadmeson-aa879b7f0cd3ed36e87ee7699e060c48d66f6b67.zip
meson-aa879b7f0cd3ed36e87ee7699e060c48d66f6b67.tar.gz
meson-aa879b7f0cd3ed36e87ee7699e060c48d66f6b67.tar.bz2
Fix issues found by flake8
-rw-r--r--mesonbuild/backend/backends.py2
-rw-r--r--mesonbuild/compilers/__init__.py2
-rw-r--r--mesonbuild/compilers/c.py2
-rw-r--r--mesonbuild/compilers/compilers.py1
-rw-r--r--mesonbuild/compilers/cpp.py1
-rw-r--r--mesonbuild/compilers/fortran.py2
-rw-r--r--mesonbuild/mconf.py1
-rw-r--r--mesonbuild/modules/__init__.py2
-rw-r--r--mesonbuild/modules/gnome.py1
-rw-r--r--mesonbuild/scripts/meson_install.py2
-rw-r--r--setup.cfg4
11 files changed, 9 insertions, 11 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index d347e66..14e0fc3 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -21,7 +21,7 @@ from .. import compilers
import json
import subprocess
from ..mesonlib import MesonException, OrderedSet
-from ..mesonlib import get_compiler_for_source, classify_unity_sources
+from ..mesonlib import classify_unity_sources
from ..mesonlib import File
from ..compilers import CompilerArgs
from collections import OrderedDict
diff --git a/mesonbuild/compilers/__init__.py b/mesonbuild/compilers/__init__.py
index 288b3f5..6b31cca 100644
--- a/mesonbuild/compilers/__init__.py
+++ b/mesonbuild/compilers/__init__.py
@@ -41,6 +41,8 @@ __all__ = [
'sanitizer_compile_args',
'sort_clike',
+ 'ArmCCompiler',
+ 'ArmCPPCompiler',
'CCompiler',
'ClangCCompiler',
'ClangCompiler',
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index e14d3d8..90105a0 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import subprocess, os.path, tempfile
+import subprocess, os.path
from .. import mlog
from .. import coredata
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index fcb658b..b61398f 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1281,7 +1281,6 @@ class ElbrusCompiler(GnuCompiler):
break
return paths
-
class ClangCompiler:
def __init__(self, clang_type):
self.id = 'clang'
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 22f3d67..c3bb59d 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -14,7 +14,6 @@
import os.path
-from .. import mlog
from .. import coredata
from ..mesonlib import version_compare
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 16a89b2..d0b538a 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os.path, subprocess
-
from .c import CCompiler
from .compilers import (
ICC_STANDARD,
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
index 9ac5d4a..96784aa 100644
--- a/mesonbuild/mconf.py
+++ b/mesonbuild/mconf.py
@@ -15,7 +15,6 @@
import os
import sys
import argparse
-import shlex
from . import (coredata, mesonlib, build)
def buildparser():
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py
index 55bbbd3..e871b87 100644
--- a/mesonbuild/modules/__init__.py
+++ b/mesonbuild/modules/__init__.py
@@ -1,9 +1,7 @@
import os
from .. import build
-from .. import dependencies
from .. import mlog
-from ..mesonlib import MesonException
class permittedSnippetKwargs:
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 436a0e4..6db05ae 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -1382,7 +1382,6 @@ G_END_DECLS'''
build_dir = os.path.join(state.environment.get_build_dir(), state.subdir)
source_dir = os.path.join(state.environment.get_source_dir(), state.subdir)
pkg_cmd, vapi_depends, vapi_packages, vapi_includes = self._extract_vapi_packages(state, kwargs)
- target_name = 'generate_vapi({})'.format(library)
if 'VAPIGEN' in os.environ:
cmd = [self.interpreter.find_program_impl(os.environ['VAPIGEN'])]
else:
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index eaa992b..3b3be11 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import sys, pickle, os, shutil, subprocess, gzip, platform, errno
+import sys, pickle, os, shutil, subprocess, gzip, errno
import shlex
from glob import glob
from . import depfixer
diff --git a/setup.cfg b/setup.cfg
index edcf3c5..669c932 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,4 +20,8 @@ ignore =
E402,
# E731: do not assign a lambda expression, use a def (too many false positives)
E731
+ # E741: ambiguous variable name 'l'
+ E741
+ # E722: do not use bare except'
+ E722
max-line-length = 120