diff options
Diffstat (limited to 'repoze/bfg/registry.py')
| -rw-r--r-- | repoze/bfg/registry.py | 59 |
1 files changed, 5 insertions, 54 deletions
diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py index 06cd1b804..796ac0dfa 100644 --- a/repoze/bfg/registry.py +++ b/repoze/bfg/registry.py @@ -1,21 +1,15 @@ -import threading - -from zope.component import getGlobalSiteManager -from zope.component import getSiteManager as original_getSiteManager from zope.component.registry import Components -from zope.deprecation import deprecated -import zope.component - -from repoze.bfg.threadlocal import get_current_registry -from repoze.bfg.threadlocal import manager -from repoze.bfg.zcml import zcml_configure -class Registry(Components): +class Registry(Components, dict): # for optimization purposes, if no listeners are listening, don't try # to notify them has_listeners = False + def reset(self): + self.__init__(self.__name__) + self.clear() + def registerSubscriptionAdapter(self, *arg, **kw): result = Components.registerSubscriptionAdapter(self, *arg, **kw) self.has_listeners = True @@ -32,46 +26,3 @@ class Registry(Components): for ignored in self.subscribers(events, None): """ """ -def populateRegistry(registry, filename, package, lock=threading.Lock(), - manager=manager): # lock and manager for testing - - """ We push our ZCML-defined configuration into an app-local - component registry in order to allow more than one bfg app to live - in the same process space without one unnecessarily stomping on - the other's component registrations (although I suspect directives - that have side effects are going to fail). The only way to do - that currently is to override zope.component.getGlobalSiteManager - for the duration of the ZCML includes. We acquire a lock in case - another make_app runs in a different thread simultaneously, in a - vain attempt to prevent mixing of registrations. There's not much - we can do about non-makeRegistry code that tries to use the global - site manager API directly in a different thread while we hold the - lock. Those registrations will end up in our application's - registry.""" - - lock.acquire() - manager.push({'registry':registry, 'request':None}) - try: - original_getSiteManager.sethook(get_current_registry) - zope.component.getGlobalSiteManager = get_current_registry - zcml_configure(filename, package) - finally: - zope.component.getGlobalSiteManager = getGlobalSiteManager - lock.release() - manager.pop() - -getSiteManager = get_current_registry # b/c - -deprecated('getSiteManager', - 'As of repoze.bfg 1.0, any import of getSiteManager from' - '``repoze.bfg.registry`` is ' - 'deprecated. Use ``from zope.compponent import getSiteManager ' - 'instead.') - -get_registry = get_current_registry # b/c - -deprecated('get_registry', - 'As of repoze.bfg 1.0, any import of get_registry from' - '``repoze.bfg.registry`` is ' - 'deprecated. Use ``from repoze.bfg.threadlocal import ' - 'get_current_registry instead.') |