summaryrefslogtreecommitdiff
path: root/repoze/bfg/resource.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-02-05 00:48:23 +0000
committerChris McDonough <chrism@agendaless.com>2010-02-05 00:48:23 +0000
commit8470b837db68b0ef4ccfb5bb2eff92ff53a2892b (patch)
treeba73096cd3a8f400636a1b0868dd5d31cd3a2208 /repoze/bfg/resource.py
parent5dee60129e76ce8415fe3cb07c58da64fea3e169 (diff)
downloadpyramid-8470b837db68b0ef4ccfb5bb2eff92ff53a2892b.tar.gz
pyramid-8470b837db68b0ef4ccfb5bb2eff92ff53a2892b.tar.bz2
pyramid-8470b837db68b0ef4ccfb5bb2eff92ff53a2892b.zip
- More correct conversion of provided ``renderer`` values to resource
specification values (internal).
Diffstat (limited to 'repoze/bfg/resource.py')
-rw-r--r--repoze/bfg/resource.py11
1 files changed, 6 insertions, 5 deletions
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