summaryrefslogtreecommitdiff
path: root/repoze/bfg/resource.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-06-30 23:09:17 +0000
committerChris McDonough <chrism@agendaless.com>2009-06-30 23:09:17 +0000
commitb6c867e7d8f8c34138efadc5efd0c9f30bff9ecb (patch)
tree1923a3ff04976cfb031b00b2b78d7625cb6a4dcc /repoze/bfg/resource.py
parentcc0bc9b032d59c740dbf27fdb46cd6a541f8df47 (diff)
downloadpyramid-b6c867e7d8f8c34138efadc5efd0c9f30bff9ecb.tar.gz
pyramid-b6c867e7d8f8c34138efadc5efd0c9f30bff9ecb.tar.bz2
pyramid-b6c867e7d8f8c34138efadc5efd0c9f30bff9ecb.zip
- Bug fix: when a ``repoze.bfg.resource.PackageOverrides`` class was
instantiated, and the package it was overriding already had a ``__loader__`` attribute, it would fail at startup time, even if the ``__loader__`` attribute was another PackageOverrides instance. We now replace any ``__loader__`` that is also a PackageOverrides instance. Symptom: ``ConfigurationExecutionError: <type 'exceptions.TypeError'>: Package <module 'karl.views' from '/Users/chrism/projects/osi/bfgenv/src/karl/karl/views/__init__.pyc'> already has a __loader__ (probably a module in a zipped egg)``.
Diffstat (limited to 'repoze/bfg/resource.py')
-rw-r--r--repoze/bfg/resource.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/repoze/bfg/resource.py b/repoze/bfg/resource.py
index 4112925b4..276c52878 100644
--- a/repoze/bfg/resource.py
+++ b/repoze/bfg/resource.py
@@ -50,9 +50,11 @@ class PackageOverrides:
implements(IPackageOverrides)
# pkg_resources arg in kw args below for testing
def __init__(self, package, pkg_resources=pkg_resources):
- if hasattr(package, '__loader__'):
- raise TypeError('Package %s already has a __loader__ '
- '(probably a module in a zipped egg)' % package)
+ if hasattr(package, '__loader__') and not isinstance(package.__loader__,
+ self.__class__):
+ raise TypeError('Package %s already has a non-%s __loader__ '
+ '(probably a module in a zipped egg)' %
+ (package, self.__class__))
# We register ourselves as a __loader__ *only* to support the
# setuptools _find_adapter adapter lookup; this class doesn't
# actually support the PEP 302 loader "API". This is