From: Armin Ronacher Date: Fri, 6 Jun 2014 17:10:07 +0000 (+0600) Subject: Flake 8 fixes X-Git-Tag: 2.8~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c987bef45c73e2f6d31a638a19cc107b33abf9;p=thirdparty%2Fjinja.git Flake 8 fixes --- diff --git a/jinja2/parser.py b/jinja2/parser.py index 18ed844a..43755a0f 100644 --- a/jinja2/parser.py +++ b/jinja2/parser.py @@ -14,7 +14,6 @@ from jinja2.lexer import describe_token, describe_token_expr from jinja2._compat import imap -#: statements that callinto _statement_keywords = frozenset(['for', 'if', 'block', 'extends', 'print', 'macro', 'include', 'from', 'import', 'set']) @@ -434,8 +433,8 @@ class Parser(object): ops.append(nodes.Operand(token_type, self.parse_add())) elif self.stream.skip_if('name:in'): ops.append(nodes.Operand('in', self.parse_add())) - elif self.stream.current.test('name:not') and \ - self.stream.look().test('name:in'): + elif (self.stream.current.test('name:not') and + self.stream.look().test('name:in')): self.stream.skip(2) ops.append(nodes.Operand('notin', self.parse_add())) else: @@ -771,7 +770,7 @@ class Parser(object): else: ensure(dyn_args is None and dyn_kwargs is None) if self.stream.current.type == 'name' and \ - self.stream.look().type == 'assign': + self.stream.look().type == 'assign': key = self.stream.current.value self.stream.skip(2) value = self.parse_expression() @@ -824,11 +823,11 @@ class Parser(object): kwargs = [] if self.stream.current.type == 'lparen': args, kwargs, dyn_args, dyn_kwargs = self.parse_call(None) - elif self.stream.current.type in ('name', 'string', 'integer', - 'float', 'lparen', 'lbracket', - 'lbrace') and not \ - self.stream.current.test_any('name:else', 'name:or', - 'name:and'): + elif (self.stream.current.type in ('name', 'string', 'integer', + 'float', 'lparen', 'lbracket', + 'lbrace') and not + self.stream.current.test_any('name:else', 'name:or', + 'name:and')): if self.stream.current.test('name:is'): self.fail('You cannot chain multiple tests with is') args = [self.parse_expression()]