- More correct conversion of provided ``renderer`` values to resource

  specification values (internal).

4 files changed, 19 insertions, 8 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 5f5217d8f..3f1778e80 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+Next release
+============
+
+Bug Fixes
+---------
+
+- More correct conversion of provided ``renderer`` values to resource
+  specification values (internal).
+
 1.2b5 (2010-02-04)
 ==================
 
diff --git a/repoze/bfg/resource.py b/repoze/bfg/resource.py
index ff10273e4..f8652ca96 100644
--- a/repoze/bfg/resource.py
+++ b/repoze/bfg/resource.py
@@ -6,6 +6,7 @@ from zope.interface import implements
 from repoze.bfg.interfaces import IPackageOverrides
 
 from repoze.bfg.path import package_path
+from repoze.bfg.path import package_name
 from repoze.bfg.threadlocal import get_current_registry
 
 class OverrideProvider(pkg_resources.DefaultProvider):
@@ -172,15 +173,15 @@ class FileOverride:
         if resource_name == self.path:
             return self.package, self.prefix
 
-def resolve_resource_spec(spec, package_name='__main__'):
+def resolve_resource_spec(spec, pname='__main__'):
     if os.path.isabs(spec):
         return None, spec
     filename = spec
     if ':' in spec:
-        package_name, filename = spec.split(':', 1)
+        pname, filename = spec.split(':', 1)
     elif package_name is None:
-        package_name, filename = None, spec
-    return package_name, filename
+        pname, filename = None, spec
+    return pname, filename
 
 def resource_spec_from_abspath(abspath, package):
     """ Try to convert an absolute path to a resource in a package to
@@ -191,7 +192,7 @@ def resource_spec_from_abspath(abspath, package):
     pp = package_path(package) + os.path.sep
     if abspath.startswith(pp):
         relpath = abspath[len(pp):]
-        return '%s:%s' % (package.__name__,
+        return '%s:%s' % (package_name(package),
                           relpath.replace(os.path.sep, '/'))
     return abspath
             
diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py
index 68184b5ac..5f053d94d 100644
--- a/repoze/bfg/tests/test_view.py
+++ b/repoze/bfg/tests/test_view.py
@@ -384,18 +384,18 @@ class TestBFGViewDecorator(unittest.TestCase):
         self.failUnless(wrapped is foo)
         settings = wrapped.__bfg_view_settings__[0]
         self.assertEqual(settings['renderer'],
-                         'repoze.bfg.tests.test_view:fixtures/minimal.pt')
+                         'repoze.bfg.tests:fixtures/minimal.pt')
 
     def test_call_with_renderer_pkgpath(self):
         decorator = self._makeOne(
-            renderer='repoze.bfg.tests.test_view:fixtures/minimal.pt')
+            renderer='repoze.bfg.tests:fixtures/minimal.pt')
         def foo():
             """ docstring """
         wrapped = decorator(foo)
         self.failUnless(wrapped is foo)
         settings = wrapped.__bfg_view_settings__[0]
         self.assertEqual(settings['renderer'],
-                         'repoze.bfg.tests.test_view:fixtures/minimal.pt')
+                         'repoze.bfg.tests:fixtures/minimal.pt')
 
 class TestDefaultForbiddenView(BaseTest, unittest.TestCase):
     def _callFUT(self, context, request):
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 9148640ca..426e6e24d 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -1141,4 +1141,5 @@ class DummyRequest:
 class DummyPackage(object):
     def __init__(self, name):
         self.__name__ = name
+        self.__file__ = '/__init__.py'