diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-05-03 23:23:55 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-05-03 23:23:55 +0000 |
| commit | ebd97246da8344bed7787053aea29fda71470e4c (patch) | |
| tree | 6d7e52246a9028002d44f0c160e9dd3ff452264d | |
| parent | 35bf7ca5ce347a6ead8529ddcf5e5ea28507c332 (diff) | |
| download | pyramid-ebd97246da8344bed7787053aea29fda71470e4c.tar.gz pyramid-ebd97246da8344bed7787053aea29fda71470e4c.tar.bz2 pyramid-ebd97246da8344bed7787053aea29fda71470e4c.zip | |
- Don't require a successful import of ``zope.testing`` at BFG
application runtime. This allows us to get rid of ``zope.testing``
on platforms like GAE which have file limits.
| -rw-r--r-- | repoze/bfg/registry.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py index f73e131d5..acf947fdb 100644 --- a/repoze/bfg/registry.py +++ b/repoze/bfg/registry.py @@ -114,6 +114,10 @@ def getSiteManager(context=None): except TypeError, error: raise ComponentLookupError(*error.args) -from zope.testing.cleanup import addCleanUp -addCleanUp(original_getSiteManager.reset) # AttributeError: zope.hookable not installed -addCleanUp(registry_manager.clear) +try: + from zope.testing.cleanup import addCleanUp +except ImportError: #pragma NO COVERAGE + """ Do nothing """ #pragma NO COVERAGE doesnt work w/ 'pass' :-( +else: + addCleanUp(original_getSiteManager.reset) + addCleanUp(registry_manager.clear) |