summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2013-08-27 14:46:01 +0200
committerMarcel Hellkamp <marc@gsites.de>2013-08-27 14:46:01 +0200
commite82dbcbcaa608a056cd095a8e9ab012bad14197d (patch)
tree533562c00e20766a2e142f957d9ffe0773498f09
parentd1c339c3a6b3d3cf0ba6281136a1d115be5a1c70 (diff)
downloadbottle-e82dbcbcaa608a056cd095a8e9ab012bad14197d.tar.gz
Fixed name of base-template content variable to match documentation...
-rw-r--r--bottle.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bottle.py b/bottle.py
index 6ee0256..40a858d 100644
--- a/bottle.py
+++ b/bottle.py
@@ -3260,7 +3260,7 @@ class SimpleTemplate(BaseTemplate):
eval(self.co, env)
if env.get('_rebase'):
subtpl, rargs = env.pop('_rebase')
- rargs['body'] = ''.join(_stdout) #copy stdout
+ rargs['base'] = ''.join(_stdout) #copy stdout
del _stdout[:] # clear stdout
return self._include(env, subtpl, **rargs)
return env
@@ -3425,7 +3425,7 @@ class StplParser(object):
parts = line.strip().split(None, 2)
if parts and parts[0] in ('include', 'rebase'):
depr('The include and rebase keywords are functions now.')
- if len(parts) == 1: return "_printlist([body])", comment
+ if len(parts) == 1: return "_printlist([base])", comment
elif len(parts) == 2: return "_=%s(%r)" % tuple(parts), comment
else: return "_=%s(%r, %s)" % tuple(parts), comment
if self.lineno <= 2 and not line.strip() and 'coding' in comment: