summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2018-12-01 17:45:33 +0100
committerMarcel Hellkamp <marc@gsites.de>2018-12-01 17:49:40 +0100
commit16ba72438450e355ac2a989f03f27d401b15470f (patch)
tree0ccace0e714348d10de8d328e7e8a98a1189b860
parent0c3db605e927e6a58cefaecae3a3c6ef1e34dad5 (diff)
downloadbottle-16ba72438450e355ac2a989f03f27d401b15470f.tar.gz
Release of 0.12.15 (bugfix)0.12.15
fix #949: DeprecationWarning: Flags not at the start of the expression
-rw-r--r--bottle.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bottle.py b/bottle.py
index dae4f56..01b581e 100644
--- a/bottle.py
+++ b/bottle.py
@@ -16,7 +16,7 @@ License: MIT (see LICENSE for details)
from __future__ import with_statement
__author__ = 'Marcel Hellkamp'
-__version__ = '0.12.14'
+__version__ = '0.12.15'
__license__ = 'MIT'
# The gevent server adapter needs to patch some modules before they are imported
@@ -3445,7 +3445,7 @@ class StplParser(object):
# Match inline statements (may contain python strings)
_re_inl = '(?m)%%(inline_start)s((?:%s|[^\'"\n]*?)+)%%(inline_end)s' % _re_inl
_re_tok = '(?m)' + _re_tok
-
+
default_syntax = '<% %> % {{ }}'
def __init__(self, source, syntax=None, encoding='utf8'):