Mercurial > p > roundup > code
changeset 4727:5033c2ad80a7
templating: Rename LoaderBase.get() to LoaderBase.load() for clarity
| author | anatoly techtonik <techtonik@gmail.com> |
|---|---|
| date | Sun, 13 Jan 2013 22:39:46 +0300 |
| parents | 0040fb6e659f |
| children | 4caa6de726a5 |
| files | roundup/cgi/client.py roundup/cgi/engine_chameleon.py roundup/cgi/engine_zopetal.py roundup/cgi/templating.py test/test_templating.py |
| diffstat | 5 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/cgi/client.py Sun Jan 13 15:12:04 2013 +0300 +++ b/roundup/cgi/client.py Sun Jan 13 22:39:46 2013 +0300 @@ -1075,7 +1075,7 @@ '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
--- a/roundup/cgi/engine_chameleon.py Sun Jan 13 15:12:04 2013 +0300 +++ b/roundup/cgi/engine_chameleon.py Sun Jan 13 22:39:46 2013 +0300 @@ -12,7 +12,7 @@ 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'
--- a/roundup/cgi/engine_zopetal.py Sun Jan 13 15:12:04 2013 +0300 +++ b/roundup/cgi/engine_zopetal.py Sun Jan 13 22:39:46 2013 +0300 @@ -21,7 +21,7 @@ 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'
--- a/roundup/cgi/templating.py Sun Jan 13 15:12:04 2013 +0300 +++ b/roundup/cgi/templating.py Sun Jan 13 22:39:46 2013 +0300 @@ -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 @@ # load the template if '.' in filename: name, extension = filename.split('.', 1) - self.get(name, extension) + self.load(name, extension) else: - self.get(filename, None) - - def get(self, name, extension=None): + self.load(filename, 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 @@ 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 @@ 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 @@ '&@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
--- a/test/test_templating.py Sun Jan 13 15:12:04 2013 +0300 +++ b/test/test_templating.py Sun Jan 13 22:39:46 2013 +0300 @@ -341,7 +341,7 @@ 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):