From 5f4b80e5a1508116271ae8a6087834fff8ee3825 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 29 Jun 2009 10:18:10 +0000 Subject: - Use ``caller_package`` function instead of ``caller_module`` function within ``templating`` to avoid needing to name the caller module in resource overrides (actually match docs). - Make it possible to override templates stored directly in a module with templates in a subdirectory of the same module, stored directly within another module, or stored in a subdirectory of another module (actually match docs). --- repoze/bfg/templating.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'repoze/bfg/templating.py') diff --git a/repoze/bfg/templating.py b/repoze/bfg/templating.py index 337621eef..a81726bb9 100644 --- a/repoze/bfg/templating.py +++ b/repoze/bfg/templating.py @@ -2,7 +2,7 @@ import pkg_resources from zope.component import queryUtility from repoze.bfg.interfaces import ITemplateRenderer from zope.component import getSiteManager -from repoze.bfg.path import caller_module +from repoze.bfg.path import caller_package import os def renderer_from_cache(path, factory, level=3, **kw): @@ -19,8 +19,8 @@ def renderer_from_cache(path, factory, level=3, **kw): else: # 'path' is a relative filename - module = caller_module(level=level) - spec = (module.__name__, path) + package = caller_package(level=level) + spec = (package.__name__, path) utility_name = '%s\t%s' % spec # utility name must be a string :-( renderer = queryUtility(ITemplateRenderer, name=utility_name) if renderer is None: -- cgit v1.2.3