summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-01-12 00:32:13 +0000
committerChris McDonough <chrism@agendaless.com>2009-01-12 00:32:13 +0000
commitb16527306a1ddd0ed5c0a9db78a8ffa64c42ae2e (patch)
treeca1f671a5b9cb1fa6f5d9ef5083c5cc213867c58
parentec2941b96a8f961438f9a341c936dfa660439a95 (diff)
downloadpyramid-b16527306a1ddd0ed5c0a9db78a8ffa64c42ae2e.tar.gz
pyramid-b16527306a1ddd0ed5c0a9db78a8ffa64c42ae2e.tar.bz2
pyramid-b16527306a1ddd0ed5c0a9db78a8ffa64c42ae2e.zip
Only pop the registry stack if we've pushed on to it in makeRegistry.
-rw-r--r--repoze/bfg/registry.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index 179fbd3dd..8e4c9b5ec 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -71,9 +71,9 @@ def makeRegistry(filename, package, lock=threading.Lock()):
registry."""
lock.acquire()
+ registry = Components(package.__name__)
+ registry_manager.push(registry)
try:
- registry = Components(package.__name__)
- registry_manager.push(registry)
original_getSiteManager.sethook(getSiteManager)
zope.component.getGlobalSiteManager = registry_manager.get
zcml_configure(filename, package=package)