API break: rename Templates to Loader for zopetal and chameleon

engines.

Author: techtonik

CHANGES.txt

@@ -10,6 +10,8 @@ Features:
 - API changes. Renamed templating members to correctly reflect
   the purpose of classes and avoid confusion (anatoly techtonik)
     templating.TemplatesBase -> templating.LoaderBase
+    engine_chameleon.Templates -> engine_chameleon.Loader
+    engine_zopetal.Templates -> engine_zopetal.Loader
 
 Fixed:
 

roundup/cgi/engine_chameleon.py

@@ -3,14 +3,14 @@
 __docformat__ = 'restructuredtext'
 
 import os.path
-from chameleon import PageTemplateLoader
+import chameleon
 
 from roundup.cgi.templating import StringIO, context, find_template, LoaderBase
 
-class Templates(LoaderBase):
+class Loader(LoaderBase):
     def __init__(self, dir):
         self.dir = dir
-        self.loader = PageTemplateLoader(dir)
+        self.loader = chameleon.PageTemplateLoader(dir)
 
     def get(self, name, extension=None):
         # default the name to "home"

roundup/cgi/engine_zopetal.py

@@ -15,7 +15,7 @@
 
 GlobalTranslationService.setGlobalTranslationService(translationService)
 
-class Templates(LoaderBase):
+class Loader(LoaderBase):
     templates = {}
 
     def __init__(self, dir):

roundup/cgi/templating.py

@@ -160,7 +160,7 @@ def get_templates(dir, engine_name):
         import engine_chameleon as engine
     else:
         import engine_zopetal as engine
-    return engine.Templates(dir)
+    return engine.Loader(dir)
 
 def context(client, template=None, classname=None, request=None):
     """Return the rendering context dictionary

roundup/instance.py

@@ -288,6 +288,8 @@ def open(self, tracker_home, optimize=0):
         tracker.dbinit.config = tracker.config
 
         tracker.optimize = optimize
+        # [ ] this path doesn't seem to work anymore in 1.4.21
+        #     check and cleanup, also fix the docs
         tracker.templates = templating.Templates(tracker.config["TEMPLATES"])
         if optimize:
             tracker.templates.precompileTemplates()

test/test_templating.py

@@ -338,7 +338,7 @@ def __init__(self, action, klass):
     def __str__(self):
 def find_template(dir, name, extension):
 
-class Templates:
+class Loader:
     def __init__(self, dir):
     def precompileTemplates(self):
     def get(self, name, extension=None):