4 files changed, 6 insertions, 5 deletions
diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index 68de05c34..e935ac165 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -21,3 +21,4 @@ class Registry(Components, dict):
             # iterating over subscribers assures they get executed
             [ _ for _ in self.subscribers(events, None) ]
 
+global_registry = Registry('global')
diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py
index 88a803aac..f8136789f 100644
--- a/repoze/bfg/testing.py
+++ b/repoze/bfg/testing.py
@@ -637,3 +637,4 @@ def cleanUp(*arg, **kw):
     effectively deprecated as of :mod:`repoze.bfg` 1.1, due to its
     extensive production usage, it will never be removed."""
     setUp(*arg, **kw)
+
diff --git a/repoze/bfg/tests/test_threadlocal.py b/repoze/bfg/tests/test_threadlocal.py
index b277d6cb9..6bb18c4ff 100644
--- a/repoze/bfg/tests/test_threadlocal.py
+++ b/repoze/bfg/tests/test_threadlocal.py
@@ -90,6 +90,6 @@ class GetCurrentRegistryWithoutTestingRegistry(unittest.TestCase):
         return get_current_registry()
 
     def test_it(self):
-        from zope.component import getGlobalSiteManager
-        self.assertEqual(self._callFUT(), getGlobalSiteManager())
+        from repoze.bfg.registry import global_registry
+        self.assertEqual(self._callFUT(), global_registry)
     
diff --git a/repoze/bfg/threadlocal.py b/repoze/bfg/threadlocal.py
index 7e0de86ca..7d1b4eeda 100644
--- a/repoze/bfg/threadlocal.py
+++ b/repoze/bfg/threadlocal.py
@@ -1,6 +1,6 @@
 import threading
 
-from zope.component import getGlobalSiteManager
+from repoze.bfg.registry import global_registry
 
 class ThreadLocalManager(threading.local):
     def __init__(self, default=None):
@@ -31,8 +31,7 @@ class ThreadLocalManager(threading.local):
         self.stack[:] = []
 
 def defaults():
-    reg = getGlobalSiteManager()
-    return {'request':None, 'registry':reg}
+    return {'request':None, 'registry':global_registry}
 
 manager = ThreadLocalManager(default=defaults)