Mercurial > p > roundup > code
comparison roundup/cgi/engine_chameleon.py @ 4728:4caa6de726a5
templating: Rename 'extension' argument in Loader.load() to 'view'
to avoid confusion with file extension, and because this is what
this argument really does - specifies a different view for a class.
| author | anatoly techtonik <techtonik@gmail.com> |
|---|---|
| date | Mon, 14 Jan 2013 00:13:58 +0300 |
| parents | 5033c2ad80a7 |
| children | d82ce9ad8044 |
comparison
equal
deleted
inserted
replaced
| 4727:5033c2ad80a7 | 4728:4caa6de726a5 |
|---|---|
| 10 class Loader(LoaderBase): | 10 class Loader(LoaderBase): |
| 11 def __init__(self, dir): | 11 def __init__(self, dir): |
| 12 self.dir = dir | 12 self.dir = dir |
| 13 self.loader = chameleon.PageTemplateLoader(dir) | 13 self.loader = chameleon.PageTemplateLoader(dir) |
| 14 | 14 |
| 15 def load(self, name, extension=None): | 15 def load(self, name, view=None): |
| 16 # default the name to "home" | 16 # default the name to "home" |
| 17 if name is None: | 17 if name is None: |
| 18 name = 'home' | 18 name = 'home' |
| 19 elif extension is None and '.' in name: | 19 elif view is None and '.' in name: |
| 20 # split name | 20 # split name |
| 21 name, extension = name.split('.') | 21 name, view = name.split('.') |
| 22 | 22 |
| 23 src, filename = find_template(self.dir, name, extension) | 23 src, filename = find_template(self.dir, name, view) |
| 24 return RoundupPageTemplate(self.loader.load(src)) | 24 return RoundupPageTemplate(self.loader.load(src)) |
| 25 | 25 |
| 26 class RoundupPageTemplate(object): | 26 class RoundupPageTemplate(object): |
| 27 def __init__(self, pt): | 27 def __init__(self, pt): |
| 28 self._pt = pt | 28 self._pt = pt |