Mercurial > genshi > mirror
changeset 416:afd4a51442fa trunk
if a search path is provided to the template plugin use it instead of the package-style naming
| author | mgood |
|---|---|
| date | Mon, 12 Mar 2007 21:02:01 +0000 |
| parents | b9f9a22484f0 |
| children | 359451249ce0 |
| files | genshi/template/plugin.py |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/genshi/template/plugin.py +++ b/genshi/template/plugin.py @@ -50,6 +50,7 @@ if isinstance(auto_reload, basestring): auto_reload = auto_reload.lower() in ('1', 'on', 'yes', 'true') search_path = options.get('genshi.search_path', '').split(':') + self.use_package_naming = not search_path try: max_cache_size = int(options.get('genshi.max_cache_size', 25)) except ValueError: @@ -68,11 +69,12 @@ if template_string is not None: return self.template_class(template_string) - divider = templatename.rfind('.') - if divider >= 0: - package = templatename[:divider] - basename = templatename[divider + 1:] + self.extension - templatename = resource_filename(package, basename) + if self.use_package_naming: + divider = templatename.rfind('.') + if divider >= 0: + package = templatename[:divider] + basename = templatename[divider + 1:] + self.extension + templatename = resource_filename(package, basename) return self.loader.load(templatename)