Changeset 5151

Timestamp:

08/18/08 13:37:09 (5 months ago)

Author:

mramm

Message:

Updating rendering. Now if there is no use_legacy_renderer option turned on in config, the new rendering functions are used.

We may want to turn use_legacy_renderer on by default because:

* Currently the genshi template loader does not accept dotted notation
* The new renderers are not tested extensively yet

Files:

• trunk/docs/main/Config.rst (modified) (1 diff)
• trunk/tg/config.py (modified) (7 diffs)
• trunk/tg/controllers.py (modified) (4 diffs)
• trunk/tg/render.py (modified) (1 diff)
• trunk/tg/wsgiapp.py (modified) (2 diffs)

trunk/docs/main/Config.rst

@@ -77 +77 @@
-  base_config.default_renderer = 'mako'
-  base_config.renderers.append('mako')
+  
-
-Configuration in the INI files

trunk/tg/config.py

@@ -55 +55 @@
-        self.serve_static = True
-        self.paths = Bunch()
+        self.render_functions = Bunch()
-    
-    def setup_paths(self):
-        root = os.path.dirname(os.path.abspath(self.package.__file__))
-        # The default paths:
-dict
+Bunch
-                     controllers=os.path.join(root, 'controllers'),
-                     static_files=os.path.join(root, 'public'),
@@ -67 +68 @@
-        paths.update(self.paths)
-        self.paths = paths
-
+
-    def init_config(self, global_conf, app_conf):
-        # Initialize config with the basic options
@@ -117 +118 @@
-            imports=['from webhelpers.html import escape'],
-            default_filters=['escape'])
-
+
+
-        
-    def setup_genshi_renderer(self):
@@ -127 +129 @@
-            "Plug-in our i18n function to Genshi."
-            genshi.template.filters.insert(0, Translator(ugettext))
-
-
-
-
-
+
+
+
+
+
+
-    
-    def setup_jinja_renderer(self):
@@ -143 +146 @@
-        config['pylons.strict_c'] = True
-
-config['pylons.app_globals'].renderer_functionslo
+self.renderer_functions.jinj
-    
-    def setup_default_renderer(self):
@@ -177 +180 @@
-            self.setup_routes()
-            self.setup_helpers_and_globals()
+            
-            if self.auth_backend == "sqlalchemy": 
-                self.setup_sa_auth_backend()
@@ -183 +187 @@
-                self.setup_mako_renderer()
-
-
-
+
-            
-            if 'jinja' in self.renderers:

trunk/tg/controllers.py

@@ -25 +25 @@
-    HTTPClientError)
-from tg.render import get_tg_vars
+from tg.render import render as tg_render
-from tw.api import Widget
-from webob.exc import HTTPForbidden
@@ -215 +216 @@
-        req = pylons.request._current_obj()
-        tmpl_context = pylons.tmpl_context._current_obj()
-
-
+
+
+
+
+
-        if template_name is None:
-            return response
@@ -230 +234 @@
-
-        # Prepare the engine, if it's not already been prepared.
-
-
-
-
-
+
+
+
+
+
+
-
-        #if there is an identity, push it to the pylons template context
@@ -259 +264 @@
-
-        # Render the result.
-
+
+
-                               template_name=template_name,
-                               include_pylons_variables=False,
-                               namespace=namespace)
+        else: 
+            result = tg_render(template_vars=namespace,
+                      template_engine=engine_name,
+                      template_name=template_name)
-        return result
-

trunk/tg/render.py

@@ -133 +133 @@
-
-def render(template_vars, template_engine=None, template_name=None, **kwargs):
-
+
+
+
-    if not template_vars: 
-        template_vars={}
-mpl
+emplate
-    if not render_function:
-tg.default_renderer'
-   
+render_functions'][config['default_renderer']
+return
-
-def render_genshi(template_name, template_vars, **kwargs):
-    """Render a the template_vars with the Genshi template"""
-    template_vars['XML'] = XML
-
+e
-                                    **kwargs)
-

trunk/tg/wsgiapp.py

@@ -1 @@
-
+
+
-from pylons.util import class_name_from_module_name
-import sys
-
-class TGApp(PylonsApp):
-
-    def find_controller(self, controller):
-        """Locates a controller by attempting to import it then grab
@@ -26 +26 @@
-        #attach the package
-        pylons_package = self.config['pylons.package']
-pylons_package+'.'+controller_path.replace('/', '.')+'.'+controller.replace('/', '.')
-
-print full_module_name
+(pylons_package+'.' + 
+
+                    '.' + controller.replace('/', '.'))
-
-        # Hide the traceback here if the import fails (bad syntax and such)