diff options
author | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-19 03:03:50 -0700 |
---|---|---|
committer | Armin Ronacher <armin.ronacher@active-4.com> | 2013-05-19 03:03:50 -0700 |
commit | 96512acabd77edf25c1aff1529c1eec94ffa5c65 (patch) | |
tree | c0c3bcd40d85226df5e5d87656b06af0a361dc5f /jinja2 | |
parent | c64cc50eda33085c063517039c89ad6796dca1e4 (diff) | |
parent | 08f38a872c89dc18036fcee221c6b368a4fe1476 (diff) | |
download | jinja2-96512acabd77edf25c1aff1529c1eec94ffa5c65.tar.gz |
Merge pull request #203 from aspiers/master
Prevent line statements eating newlines (fixes #52)
Diffstat (limited to 'jinja2')
-rw-r--r-- | jinja2/lexer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jinja2/lexer.py b/jinja2/lexer.py index d56bc67..bd2e861 100644 --- a/jinja2/lexer.py +++ b/jinja2/lexer.py @@ -204,7 +204,7 @@ def compile_rules(environment): if environment.line_statement_prefix is not None: rules.append((len(environment.line_statement_prefix), 'linestatement', - r'^\s*' + e(environment.line_statement_prefix))) + r'^[ \t\v]*' + e(environment.line_statement_prefix))) if environment.line_comment_prefix is not None: rules.append((len(environment.line_comment_prefix), 'linecomment', r'(?:^|(?<=\S))[^\S\r\n]*' + |