- 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).

1 files changed, 2 insertions, 3 deletions

diff --git a/repoze/bfg/tests/test_templating.py b/repoze/bfg/tests/test_templating.py
index 3ae0483d9..d413acc2e 100644
--- a/repoze/bfg/tests/test_templating.py
+++ b/repoze/bfg/tests/test_templating.py
@@ -54,8 +54,8 @@ class TestRendererFromCache(unittest.TestCase):
 
     def test_relpath_alreadyregistered(self):
         from repoze.bfg.interfaces import ITemplateRenderer
-        from repoze.bfg.tests import test_templating
-        module_name = test_templating.__name__
+        from repoze.bfg import tests
+        module_name = tests.__name__
         relpath = 'test_templating.py'
         spec = '%s\t%s' % (module_name, relpath)
         renderer = {}
@@ -64,7 +64,6 @@ class TestRendererFromCache(unittest.TestCase):
         self.failUnless(result is renderer)
 
     def test_relpath_notyetregistered(self):
-        from repoze.bfg import resource
         import os
         from repoze.bfg.tests import test_templating
         module_name = test_templating.__name__