diff options
Diffstat (limited to 'repoze')
| -rw-r--r-- | repoze/bfg/resource.py | 8 | ||||
| -rw-r--r-- | repoze/bfg/tests/test_resource.py | 9 |
2 files changed, 13 insertions, 4 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 diff --git a/repoze/bfg/tests/test_resource.py b/repoze/bfg/tests/test_resource.py index 9f466b002..5bc1be152 100644 --- a/repoze/bfg/tests/test_resource.py +++ b/repoze/bfg/tests/test_resource.py @@ -123,11 +123,18 @@ class TestPackageOverrides(unittest.TestCase): pkg_resources = DummyPkgResources() return klass(package, pkg_resources=pkg_resources) - def test_ctor_package_already_has_loader(self): + def test_ctor_package_already_has_loader_of_different_type(self): package = DummyPackage('package') package.__loader__ = True self.assertRaises(TypeError, self._makeOne, package) + def test_ctor_package_already_has_loader_of_same_type(self): + dummy_pkg_resources = DummyPkgResources() + package = DummyPackage('package') + package.__loader__ = self._makeOne(package) + po = self._makeOne(package) + self.assertEqual(package.__loader__, po) + def test_ctor_sets_loader(self): package = DummyPackage('package') po = self._makeOne(package) |