templating: Rename LoaderBase.get() to LoaderBase.load() for clarity

Author: techtonik

roundup/cgi/client.py

@@ -1075,7 +1075,7 @@ def renderContext(self):
             'error_message': self.error_message
         }
         try:
-            pt = self.instance.templates.get(name, extension)
+            pt = self.instance.templates.load(name, extension)
             # let the template render figure stuff out
             result = pt.render(self, None, None, **args)
             self.additional_headers['Content-Type'] = pt.content_type

roundup/cgi/engine_chameleon.py

@@ -12,7 +12,7 @@ def __init__(self, dir):
         self.dir = dir
         self.loader = chameleon.PageTemplateLoader(dir)
 
-    def get(self, name, extension=None):
+    def load(self, name, extension=None):
         # default the name to "home"
         if name is None:
             name = 'home'

roundup/cgi/engine_zopetal.py

@@ -21,7 +21,7 @@ class Loader(LoaderBase):
     def __init__(self, dir):
         self.dir = dir
 
-    def get(self, name, extension=None):
+    def load(self, name, extension=None):
         # default the name to "home"
         if name is None:
             name = 'home'

roundup/cgi/templating.py

@@ -4,6 +4,7 @@
 """
 
 todo = """
+- Add tests for Loader.load() method
 - Most methods should have a "default" arg to supply a value
   when none appears in the hyperdb or request.
 - Multilink property additions: change_note and new_upload
@@ -140,11 +141,11 @@ def precompileTemplates(self):
             # load the template
             if '.' in filename:
                 name, extension = filename.split('.', 1)
-                self.get(name, extension)
+                self.load(name, extension)
             else:
-                self.get(filename, None)
+                self.load(filename, None)
 
-    def get(self, name, extension=None):
+    def load(self, name, extension=None):
         """ Interface to get a template, possibly loading a compiled template.
 
             "name" and "extension" indicate the template we're after, which in
@@ -163,7 +164,7 @@ def __getitem__(self, name):
         if extension:
             extension = extension[1:]
         try:
-            return self.get(name, extension)
+            return self.load(name, extension)
         except NoTemplate, message:
             raise KeyError, message
 
@@ -699,7 +700,7 @@ def renderWith(self, name, **kwargs):
         req.update(kwargs)
 
         # new template, using the specified classname and request
-        pt = self._client.instance.templates.get(self.classname, name)
+        pt = self._client.instance.templates.load(self.classname, name)
 
         # use our fabricated request
         args = {
@@ -1086,7 +1087,7 @@ def renderQueryForm(self):
             '&@queryname=%s'%urllib.quote(name))
 
         # new template, using the specified classname and request
-        pt = self._client.instance.templates.get(req.classname, 'search')
+        pt = self._client.instance.templates.load(req.classname, 'search')
         # The context for a search page should be the class, not any
         # node.
         self._client.nodeid = None

test/test_templating.py

@@ -341,7 +341,7 @@ def find_template(dir, name, extension):
 class Loader:
     def __init__(self, dir):
     def precompileTemplates(self):
-    def get(self, name, extension=None):
+    def load(self, name, extension=None):
     def __getitem__(self, name):
 
 class RoundupPageTemplate(PageTemplate.PageTemplate):