Ticket #2395: mako_caching.diff

tg/configuration.py

@@ -309 +309 @@
         """
         
         from tg.render import render_mako
+
+        compiled_dir = tg.config.get('templating.mako.compiled_templates_dir', None)
+        if not compiled_dir:
+            # Try each given templates path (when are they > 1 ?) for writability..
+            for template_path in self.paths['templates']:
+                if os.access(template_path, os.W_OK):
+                    compiled_dir = template_path
+                    break # first match is as good as any
+            
+            # Last recourse: project-dir/data/templates (pylons' default directory)
+            if not compiled_dir:
+                root = os.path.dirname(os.path.abspath(self.package.__file__))
+                pylons_default_path = os.path.join(root, '../data/templates')
+                if os.access(pylons_default_path, os.W_OK):
+                    compiled_dir = pylons_default_path
+    
+                if not compiled_dir:
+                    raise IOError("None of your templates directory, %s, are writable for compiled "
+                        "templates. Please set the templating.mako.compiled_templates_dir "
+                        "variable in your .ini file" % str(self.paths['templates']))
+            
         
         if not use_dotted_templatenames:
             use_dotted_templatenames = asbool(config.get('use_dotted_templatenames', 'true'))
@@ -320 +341 @@
             config['pylons.app_globals'].mako_lookup = DottedTemplateLookup(
                 input_encoding='utf-8', output_encoding='utf-8',
                 imports=['from webhelpers.html import escape'],
-                default_filters=['escape'])
+                default_filters=['escape'], module_directory=compiled_dir)
 
         else:
             # If no dotted names support was required we will just setup
             # a file system based template lookup mechanism.
-            compiled_dir = tg.config.get('templating.mako.compiled_templates_dir', None)
 
-            if not compiled_dir:
-                # Try each given templates path (when are they > 1 ?) for writability..
-                for template_path in self.paths['templates']:
-                    if os.access(template_path, os.W_OK):
-                        compiled_dir = template_path
-                        break # first match is as good as any
-                
-                # Last recourse: project-dir/data/templates (pylons' default directory)
-                if not compiled_dir:
-                    root = os.path.dirname(os.path.abspath(self.package.__file__))
-                    pylons_default_path = os.path.join(root, '../data/templates')
-                    if os.access(pylons_default_path, os.W_OK):
-                        compiled_dir = pylons_default_path
-        
-                    if not compiled_dir:
-                        raise IOError("None of your templates directory, %s, are writable for compiled "
-                            "templates. Please set the templating.mako.compiled_templates_dir "
-                            "variable in your .ini file" % str(self.paths['templates']))
-            
             from mako.lookup import TemplateLookup
             config['pylons.app_globals'].mako_lookup = TemplateLookup(
                 directories=self.paths['templates'],

tg/dottednames/mako_lookup.py

@@ -36 +36 @@
     """
 
     def __init__(self, input_encoding, output_encoding,
-            imports, default_filters):
+            imports, default_filters, module_directory=None):
 
         self.input_encoding = input_encoding
         self.output_encoding = output_encoding
@@ -46 +46 @@
         self.template_cache = dict()
         # implement a cache for the filename lookups
         self.template_filenames_cache = dict()
+        self.module_directory = module_directory
 
         # a mutex to ensure thread safeness during template loading
         self._mutex = threading.Lock()
@@ -131 +132 @@
                 pass
 
             try:
-                self.template_cache[filename] = Template(open(filename).read(),
+                self.template_cache[filename] = Template(
                     filename=filename,
                     input_encoding=self.input_encoding,
                     output_encoding=self.output_encoding,
                     default_filters=self.default_filters,
                     imports=self.imports,
+                    module_directory=self.module_directory,
                     lookup=self)
 
                 return self.template_cache[filename]