better handling of delimeters in template, thanks Corne Dickens

VERSION

@@ -1 +1 @@
-Version 2.4.6-stable+timestamp.2013.05.19.22.13.58
+Version 2.4.6-stable+timestamp.2013.05.24.08.27.55

gluon/template.py

@@ -562,8 +562,8 @@ class TemplateParser(object):
                 if in_tag:
                     line = i
 
-                    # Get rid of '{{' and '}}'
-                    line = line[2:-2].strip()
+                    # Get rid of delimiters
+                    line = line[len(self.delimiters[0]):-len(self.delimiters[1])].strip()
 
                     # This is bad juju, but let's do it anyway
                     if not line:
@@ -832,7 +832,8 @@ def render(content="hello world",
            path=None,
            context={},
            lexers={},
-           delimiters=('{{', '}}')
+           delimiters=('{{', '}}'),
+           writer='response.write'
            ):
     """
     >>> render()
@@ -895,7 +896,7 @@ def render(content="hello world",
 
     # Execute the template.
     code = str(TemplateParser(stream.read(
-    ), context=context, path=path, lexers=lexers, delimiters=delimiters))
+    ), context=context, path=path, lexers=lexers, delimiters=delimiters, writer=writer))
     try:
         exec(code) in context
     except Exception:

gluon/tools.py

@@ -5269,6 +5269,7 @@ class Wiki(object):
             else:
                 return dict(title=page.title,
                             slug=page.slug,
+                            page=page,
                             content=XML(self.fix_hostname(page.html)),
                             tags=page.tags,
                             created_on=page.created_on,
@@ -5281,6 +5282,7 @@ class Wiki(object):
             else:
                 return dict(title=page.title,
                             slug=page.slug,
+                            page=page,
                             content=page.body,
                             tags=page.tags,
                             created_on=page.created_on,