Skip to content

Commit

Permalink
Fix issues found by flake8
Browse files Browse the repository at this point in the history
  • Loading branch information
xclaesse authored and nirbheek committed Jun 6, 2018
1 parent b7d4421 commit aa879b7
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion mesonbuild/backend/backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
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
Expand Down
2 changes: 2 additions & 0 deletions mesonbuild/compilers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
'sanitizer_compile_args',
'sort_clike',

'ArmCCompiler',
'ArmCPPCompiler',
'CCompiler',
'ClangCCompiler',
'ClangCompiler',
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/compilers/c.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mesonbuild/compilers/compilers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,6 @@ def get_program_dirs(self):
break
return paths


class ClangCompiler:
def __init__(self, clang_type):
self.id = 'clang'
Expand Down
1 change: 0 additions & 1 deletion mesonbuild/compilers/cpp.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import os.path

from .. import mlog
from .. import coredata
from ..mesonlib import version_compare

Expand Down
2 changes: 0 additions & 2 deletions mesonbuild/compilers/fortran.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion mesonbuild/mconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import os
import sys
import argparse
import shlex
from . import (coredata, mesonlib, build)

def buildparser():
Expand Down
2 changes: 0 additions & 2 deletions mesonbuild/modules/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import os

from .. import build
from .. import dependencies
from .. import mlog
from ..mesonlib import MesonException

class permittedSnippetKwargs:

Expand Down
1 change: 0 additions & 1 deletion mesonbuild/modules/gnome.py
Original file line number Diff line number Diff line change
Expand Up @@ -1382,7 +1382,6 @@ def generate_vapi(self, state, args, kwargs):
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:
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/scripts/meson_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit aa879b7

Please sign in to comment.