From d230e7744c1f3453838354b65ee056794d2d3f59 Mon Sep 17 00:00:00 2001 From: Erez Shinan Date: Wed, 1 Mar 2017 13:25:27 +0200 Subject: [PATCH] Pylint --- examples/reconstruct_json.py | 3 ++- lark/common.py | 2 +- lark/indenter.py | 2 +- lark/lark.py | 2 +- lark/lexer.py | 4 ++-- lark/load_grammar.py | 4 ++-- lark/parser_frontends.py | 5 ++--- lark/parsers/nearley.py | 2 +- lark/reconstruct.py | 4 +--- lark/utils.py | 2 +- 10 files changed, 14 insertions(+), 16 deletions(-) diff --git a/examples/reconstruct_json.py b/examples/reconstruct_json.py index 27f02da..7f434fe 100644 --- a/examples/reconstruct_json.py +++ b/examples/reconstruct_json.py @@ -6,11 +6,12 @@ # import json -from .json_parser import json_grammar from lark import Lark from lark.reconstruct import Reconstructor +from .json_parser import json_grammar + def test(): test_json = ''' diff --git a/lark/common.py b/lark/common.py index 3306d68..fee6d75 100644 --- a/lark/common.py +++ b/lark/common.py @@ -24,7 +24,7 @@ class UnexpectedToken(ParseError): "Expected: %s\n" "Context: %s" % (token, self.line, self.column, expected, context)) - super(ParseError, self).__init__(message) + super(UnexpectedToken, self).__init__(message) diff --git a/lark/indenter.py b/lark/indenter.py index 24ac170..a5f107d 100644 --- a/lark/indenter.py +++ b/lark/indenter.py @@ -8,7 +8,7 @@ class Indenter: self.indent_level = [0] def handle_NL(self, token): - if (self.paren_level > 0): + if self.paren_level > 0: return yield token diff --git a/lark/lark.py b/lark/lark.py index 68ef95f..aa0c210 100644 --- a/lark/lark.py +++ b/lark/lark.py @@ -7,7 +7,7 @@ from collections import defaultdict from .utils import STRING_TYPE from .load_grammar import load_grammar from .tree import Tree -from .common import GrammarError, LexerConf, ParserConf +from .common import LexerConf, ParserConf from .lexer import Lexer from .parse_tree_builder import ParseTreeBuilder diff --git a/lark/lexer.py b/lark/lexer.py index c02c34c..349f999 100644 --- a/lark/lexer.py +++ b/lark/lexer.py @@ -2,7 +2,7 @@ import re -from .utils import Str, classify, STRING_TYPE +from .utils import Str, classify from .common import is_terminal, PatternStr, PatternRE, TokenDef class LexError(Exception): @@ -13,7 +13,7 @@ class UnexpectedInput(LexError): context = seq[lex_pos:lex_pos+5] message = "No token defined for: '%s' in %r at line %d" % (seq[lex_pos], context, line) - super(LexError, self).__init__(message) + super(UnexpectedInput, self).__init__(message) self.line = line self.column = column diff --git a/lark/load_grammar.py b/lark/load_grammar.py index 0b16651..9b5028e 100644 --- a/lark/load_grammar.py +++ b/lark/load_grammar.py @@ -3,7 +3,7 @@ from itertools import chain import re from ast import literal_eval -from .lexer import Lexer, Token, UnexpectedInput +from .lexer import Token, UnexpectedInput from .parse_tree_builder import ParseTreeBuilder from .parser_frontends import LALR @@ -526,7 +526,7 @@ class GrammarLoader: token_tree = dict(g.token_defs)[dotted_path[-1]] token_defs.append([name.value, token_tree]) else: - assert False, command + assert False, stmt # Verify correctness 1 diff --git a/lark/parser_frontends.py b/lark/parser_frontends.py index b9a185b..3d16737 100644 --- a/lark/parser_frontends.py +++ b/lark/parser_frontends.py @@ -5,7 +5,6 @@ from .lexer import Lexer, ContextualLexer, Token from .common import is_terminal, GrammarError, ParserConf from .parsers import lalr_parser, earley, nearley -from .parsers.grammar_analysis import Rule from .tree import Transformer class WithLexer: @@ -126,7 +125,7 @@ class Nearley_NoLex: if is_terminal(sym): regexp = self.token_by_name[sym].pattern.to_regexp() width = sre_parse.parse(regexp).getwidth() - if not width == (1,1): + if width != (1,1): raise GrammarError('Dynamic lexing requires all tokens to have a width of 1 (%s is %s)' % (regexp, width)) yield sym, re.compile(regexp) else: @@ -168,7 +167,7 @@ class Earley_NoLex: if is_terminal(sym): regexp = self.token_by_name[sym].pattern.to_regexp() width = sre_parse.parse(regexp).getwidth() - if not width == (1,1): + if width != (1,1): raise GrammarError('Scanless parsing (lexer=None) requires all tokens to have a width of 1 (terminal %s: %s is %s)' % (sym, regexp, width)) yield (re.compile(regexp).match, regexp) else: diff --git a/lark/parsers/nearley.py b/lark/parsers/nearley.py index b2a511e..8788d39 100644 --- a/lark/parsers/nearley.py +++ b/lark/parsers/nearley.py @@ -1,6 +1,6 @@ "My name is Earley" -from ..utils import classify, STRING_TYPE +from ..utils import classify from ..common import ParseError, UnexpectedToken try: diff --git a/lark/reconstruct.py b/lark/reconstruct.py index 5ac68ad..3fe2e03 100644 --- a/lark/reconstruct.py +++ b/lark/reconstruct.py @@ -5,7 +5,6 @@ from .tree import Tree from .common import is_terminal, ParserConf, PatternStr from .lexer import Token from .parsers import earley -from .lark import Lark @@ -68,7 +67,7 @@ class Reconstructor: return to_write d = defaultdict(list) - for name, (expansions, options) in parser.rules.items(): + for name, (expansions, _o) in parser.rules.items(): for expansion, alias in expansions: if alias: d[alias].append(expansion) @@ -104,4 +103,3 @@ class Reconstructor: def reconstruct(self, tree): return ''.join(self._reconstruct(tree)) - diff --git a/lark/utils.py b/lark/utils.py index 719204d..aa961f2 100644 --- a/lark/utils.py +++ b/lark/utils.py @@ -60,7 +60,7 @@ def inline_args(f): return _f_func elif isinstance(f, (type, types.BuiltinFunctionType)): @functools.wraps(f) - def _f_builtin(self, args): + def _f_builtin(_self, args): return f(*args) return _f_builtin else: