diff --git a/.local.vimrc b/.local.vimrc index afd2178e..68bf2234 100644 --- a/.local.vimrc +++ b/.local.vimrc @@ -1,2 +1,3 @@ setlocal noexpandtab -let g:syntastic_python_flake8_args = '--ignore=W191,E501,E121,E122,E123,E128,E225,W291' +let g:syntastic_python_flake8_args = '--ignore=W191,E501,E121,E122,E123,E128,E225,W291,E126' +let b:syntastic_checkers = ['flake8'] diff --git a/powerline/lint/__init__.py b/powerline/lint/__init__.py index 2570df41..9d7a009b 100644 --- a/powerline/lint/__init__.py +++ b/powerline/lint/__init__.py @@ -6,7 +6,6 @@ from powerline.lib.config import load_json_config from powerline.lint.markedjson.error import echoerr, MarkedError from powerline.segments.vim import vim_modes from powerline.lint.inspect import getconfigargspec -from powerline.lint.markedjson.markedvalue import gen_marked_value from powerline.lib.threaded import ThreadedSegment import itertools import sys diff --git a/powerline/lint/inspect.py b/powerline/lint/inspect.py index b0f0c7af..294f2f59 100644 --- a/powerline/lint/inspect.py +++ b/powerline/lint/inspect.py @@ -4,6 +4,7 @@ from inspect import ArgSpec, getargspec from powerline.lib.threaded import ThreadedSegment, KwThreadedSegment from itertools import count + def getconfigargspec(obj): if isinstance(obj, ThreadedSegment): args = ['interval'] diff --git a/powerline/lint/markedjson/error.py b/powerline/lint/markedjson/error.py index d1466675..781b912b 100644 --- a/powerline/lint/markedjson/error.py +++ b/powerline/lint/markedjson/error.py @@ -53,13 +53,13 @@ class Mark: break snippet = [self.buffer[start:self.pointer], self.buffer[self.pointer], self.buffer[self.pointer + 1:end]] snippet = [strtrans(s) for s in snippet] - return ' ' * indent + head + ''.join(snippet) + tail + '\n' \ - + ' ' * (indent + len(head) + len(snippet[0])) + '^' + return (' ' * indent + head + ''.join(snippet) + tail + '\n' + + ' ' * (indent + len(head) + len(snippet[0])) + '^') def __str__(self): snippet = self.get_snippet() - where = " in \"%s\", line %d, column %d" \ - % (self.name, self.line + 1, self.column + 1) + where = (" in \"%s\", line %d, column %d" + % (self.name, self.line + 1, self.column + 1)) if snippet is not None: where += ":\n" + snippet if type(where) is str: diff --git a/powerline/lint/markedjson/resolver.py b/powerline/lint/markedjson/resolver.py index f628a872..e453f61e 100644 --- a/powerline/lint/markedjson/resolver.py +++ b/powerline/lint/markedjson/resolver.py @@ -71,8 +71,8 @@ class BaseResolver: return if index_check is True and current_index is not None: return - if (index_check is False or index_check is None) \ - and current_index is None: + if ((index_check is False or index_check is None) + and current_index is None): return if isinstance(index_check, str): if not (isinstance(current_index, ScalarNode)