Ticket #1963: buffet_patch.diff

turbogears/controllers.py

@@ -34 +34 @@
 
 
 def _process_output(output, template, format, content_type,
-        mapping, fragment=False):
+        fragment=False, **options):
     """Produce final output form from data returned from a controller method.
 
     See the expose() arguments for more info since they are the same.
@@ -92 +92 @@
 
         headers = {'Content-Type': content_type}
         output = view.render(output, template=template, format=format,
-                    mapping=mapping, headers=headers,
-                    fragment=fragment)
+                headers=headers, fragment=fragment, **options)
         content_type = headers['Content-Type']
 
     if content_type:
@@ -260 +259 @@
 
 def expose(template=None, allow_json=None,
            format=None, content_type=None, fragment=False,
-           as_format="default", mapping=None, accept_format=None):
+           as_format="default", accept_format=None, **options):
     """Exposes a method to the web.
 
     By putting the expose decorator on a method, you tell TurboGears that
@@ -314 +313 @@
             just generate the immediate template fragment. Use this
             if you're building up a page from multiple templates or
             going to put something onto a page with .innerHTML.
-    @keyparam mapping mapping with options that are sent to the template
-            engine
     @keyparam as_format designates which value of tg_format will choose
             this expose.
     @keyparam accept_format which value of an Accept: header will
             choose this expose.
 
+    All additional options are passed as keyword parameters
+    to the render method of the template engine.
+
     """
     if not template:
         template = format
@@ -384 +384 @@
             accept_format=accept_format, template=template,
             rulefunc=lambda _func, accept, allow_json, *args, **kw:
                 _execute_func(_func, template, format, content_type,
-                    mapping, fragment, args, kw)))
+                    fragment, options, args, kw)))
 
         if allow_json:
             func._allow_json = True
@@ -393 +393 @@
     return weak_signature_decorator(entangle)
 
 
-def _execute_func(func, template, format, content_type, mapping, fragment, args, kw):
+def _execute_func(func, template, format, content_type, fragment,
+        options, args, kw):
     """Call controller method and process it's output."""
 
     if config.get("tg.strict_parameters", False):
@@ -440 +441 @@
             format = output.pop("tg_format", format)
 
         if template and template.startswith("."):
-            template = func.__module__[:func.__module__.rfind('.')]+template
+            template = func.__module__[:func.__module__.rfind('.')] + template
 
-        return _process_output(output, template, format, content_type, mapping,
-                               fragment)
+        return _process_output(output, template, format,
+            content_type, fragment, **options)
 
 
 def flash(message):

turbogears/view/base.py

@@ -106 +106 @@
     return engine, template, enginename
 
 
-def render(info, template=None, format=None, headers=None, mapping=None,
-        fragment=False):
+def render(info, template=None, format=None,
+        headers=None, fragment=False, **options):
     """Renders data in the desired format.
 
     @param info: the data itself
@@ -122 +122 @@
     @param headers: for response headers, primarily the content type
     @type headers: dict
 
-    @param mapping: keyword arguments passed to the underlying engine
-    @type mapping: ?
-
     @param fragment: passed through to tell the template if only a
                      fragment of a page is desired. This is a way to allow
                      xml template engines to generate non valid html/xml
                      because you warn them to not bother about it.
     @type fragment: bool
+
+    All additional options are passed as keyword parameters
+    to the render method of the template engine.
+
     """
     environ = getattr(cherrypy.request, 'wsgi_environ', {})
     if environ.get('paste.testing', False):
@@ -191 +192 @@
 
         headers['Content-Type'] = content_type
 
-    args, kw = adapt_call(engine.render, args=[],
-        kw = dict(info=info, format=format, fragment=fragment,
-        template=template, mapping=mapping), start=1)
+    kw = dict(info=info, format=format, fragment=fragment, template=template)
+    kw.update(options)
+    args, kw = adapt_call(engine.render, args=[], kw=kw, start=1)
 
     return engine.render(**kw)