summaryrefslogtreecommitdiff
path: root/repoze/bfg/resource.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-08-13 09:56:20 +0000
committerChris McDonough <chrism@agendaless.com>2010-08-13 09:56:20 +0000
commit62b4794bb4c52080aaccc8058147f4ebe34caba6 (patch)
tree40701910cd853c169fd4720e4fb974a9b72ce60b /repoze/bfg/resource.py
parentec55db55aba80618fb250aace0d22f0aa56cef1f (diff)
downloadpyramid-62b4794bb4c52080aaccc8058147f4ebe34caba6.tar.gz
pyramid-62b4794bb4c52080aaccc8058147f4ebe34caba6.tar.bz2
pyramid-62b4794bb4c52080aaccc8058147f4ebe34caba6.zip
svn merge -r9909:HEAD $REPOZE_SVN/repoze.bfg/branches/rendererhelper
Diffstat (limited to 'repoze/bfg/resource.py')
-rw-r--r--repoze/bfg/resource.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/repoze/bfg/resource.py b/repoze/bfg/resource.py
index 4d8cff197..da49f16ec 100644
--- a/repoze/bfg/resource.py
+++ b/repoze/bfg/resource.py
@@ -174,6 +174,8 @@ class FileOverride:
return self.package, self.prefix
def resolve_resource_spec(spec, pname='__main__'):
+ if pname and not isinstance(pname, basestring):
+ pname = pname.__name__ # as package
if os.path.isabs(spec):
return None, spec
filename = spec