summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornjogun <njogun@example.net>2014-11-28 15:45:42 +0100
committerMarcel Hellkamp <marc@gsites.de>2016-10-09 15:15:08 +0200
commit8c3bf160feaa35f933fb0aa8b00bfc18eb56b75e (patch)
tree3e3284425ec47ecee5abf0b22c21ad613b973aa5
parente45dcac6fc347c3dd182a511edc82bb002f0b861 (diff)
downloadbottle-8c3bf160feaa35f933fb0aa8b00bfc18eb56b75e.tar.gz
Fix end-of-code-block template token regex
-rw-r--r--bottle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index 4459e33..7559244 100644
--- a/bottle.py
+++ b/bottle.py
@@ -3424,7 +3424,7 @@ class StplParser(object):
# 7: Our special 'end' keyword (but only if it stands alone)
_re_tok += '|((?:^|;)[ \\t]*end[ \\t]*(?=(?:%(block_close)s[ \\t]*)?\\r?$|;|#))'
# 8: A customizable end-of-code-block template token (only end of line)
- _re_tok += '|(%(block_close)s[ \\t]*(?=$))'
+ _re_tok += '|(%(block_close)s[ \\t]*(?=\\r?$))'
# 9: And finally, a single newline. The 10th token is 'everything else'
_re_tok += '|(\\r?\\n)'