# HG changeset patch # User mgood # Date 1173733321 0 # Node ID 41f2091e59e4252407dedf9b7b85c1a7f52c91de # Parent c267061c961fe5a8c29709ce66d1fc12b0f4877e if a search path is provided to the template plugin use it instead of the package-style naming diff --git a/genshi/template/plugin.py b/genshi/template/plugin.py --- 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)