repoze.bfg.request.get_request -> repoze.bfg.threadlocal.get_current_request

repoze.bfg.registry.get_registry -> repoze.bfg.threadlocal.get_current_registry

Remove getSiteManager from registry module.

3 files changed, 53 insertions, 66 deletions

diff --git a/repoze/bfg/tests/test_registry.py b/repoze/bfg/tests/test_registry.py
index 3ac0dab88..1d29aef73 100644
--- a/repoze/bfg/tests/test_registry.py
+++ b/repoze/bfg/tests/test_registry.py
@@ -54,54 +54,17 @@ class TestPopulateRegistry(unittest.TestCase):
         from repoze.bfg.tests import fixtureapp
         dummylock = DummyLock()
         dummyregmgr = DummyThreadLocalManager({'registry':None})
-        import repoze.bfg.threadlocal
-        try:
-            old = repoze.bfg.threadlocal.manager
-            repoze.bfg.threadlocal.manager = dummyregmgr
-            from zope.component.registry import Components
-            registry = Components('hello')
-            self._callFUT(registry,
-                          'configure.zcml',
-                          fixtureapp,
-                          lock=dummylock)
-            self.assertEqual(dummylock.acquired, True)
-            self.assertEqual(dummylock.released, True)
-            self.assertEqual(dummyregmgr.data['registry'], None)
-        finally:
-            repoze.bfg.threadlocal.manager = old
-
-class GetSiteManagerTests(unittest.TestCase):
-    def _callFUT(self, context=None):
-        from repoze.bfg.registry import getSiteManager
-        return getSiteManager(context)
-
-    def test_no_context(self):
-        from zope.component import getGlobalSiteManager
-        self.assertEqual(self._callFUT(), getGlobalSiteManager())
-    
-    def test_with_context(self):
-        from zope.component.interfaces import ComponentLookupError
-        self.assertRaises(ComponentLookupError, self._callFUT, object)
-
-class GetRegistryTests(unittest.TestCase):
-    def setUp(self):
-        cleanUp()
-
-    def tearDown(self):
-        cleanUp()
-        
-    def _callFUT(self):
-        from repoze.bfg.registry import get_registry
-        return get_registry()
+        from zope.component.registry import Components
+        registry = Components('hello')
+        self._callFUT(registry,
+                      'configure.zcml',
+                      fixtureapp,
+                      lock=dummylock,
+                      manager=dummyregmgr)
+        self.assertEqual(dummylock.acquired, True)
+        self.assertEqual(dummylock.released, True)
+        self.assertEqual(dummyregmgr.data['registry'], None)
 
-    def test_it(self):
-        from repoze.bfg.threadlocal import manager
-        try:
-            manager.push({'registry':123})
-            self.assertEqual(self._callFUT(), 123)
-        finally:
-            manager.pop()
-    
 class TestFakeRegistry(unittest.TestCase):
     def _getTargetClass(self):
         from repoze.bfg.registry import FakeRegistryManager
diff --git a/repoze/bfg/tests/test_request.py b/repoze/bfg/tests/test_request.py
index 9cae6643a..557e1db71 100644
--- a/repoze/bfg/tests/test_request.py
+++ b/repoze/bfg/tests/test_request.py
@@ -37,25 +37,6 @@ class TestSubclassedRequest(unittest.TestCase):
         request.charset = None
         self.assertEqual(request.GET['la'], 'La Pe\xc3\xb1a')
 
-class TestCurrentRequest(unittest.TestCase):
-    def _callFUT(self):
-        from repoze.bfg.request import current_request
-        return current_request()
-
-    def test_it_None(self):
-        request = self._callFUT()
-        self.assertEqual(request, None)
-
-    def test_it(self):
-        from repoze.bfg.threadlocal import manager
-        request = DummyRequest()
-        try:
-            manager.push({'request':request})
-            self.assertEqual(self._callFUT(), request)
-        finally:
-            manager.pop()
-        self.assertEqual(self._callFUT(), None)
-
 class TestRequestFactory(unittest.TestCase):
     def _callFUT(self, environ):
         from repoze.bfg.request import request_factory
diff --git a/repoze/bfg/tests/test_threadlocal.py b/repoze/bfg/tests/test_threadlocal.py
index 230bb3726..2cf405508 100644
--- a/repoze/bfg/tests/test_threadlocal.py
+++ b/repoze/bfg/tests/test_threadlocal.py
@@ -44,3 +44,46 @@ class TestThreadLocalManager(unittest.TestCase):
         local.clear()
         self.assertEqual(local.get(), 1)
 
+
+class TestGetCurrentRequest(unittest.TestCase):
+    def _callFUT(self):
+        from repoze.bfg.threadlocal import get_current_request
+        return get_current_request()
+
+    def test_it_None(self):
+        request = self._callFUT()
+        self.assertEqual(request, None)
+
+    def test_it(self):
+        from repoze.bfg.threadlocal import manager
+        request = object()
+        try:
+            manager.push({'request':request})
+            self.assertEqual(self._callFUT(), request)
+        finally:
+            manager.pop()
+        self.assertEqual(self._callFUT(), None)
+
+class GetCurrentRegistryTests(unittest.TestCase):
+    def setUp(self):
+        cleanUp()
+
+    def tearDown(self):
+        cleanUp()
+        
+    def _callFUT(self):
+        from repoze.bfg.threadlocal import get_current_registry
+        return get_current_registry()
+
+    def test_local(self):
+        from repoze.bfg.threadlocal import manager
+        try:
+            manager.push({'registry':123})
+            self.assertEqual(self._callFUT(), 123)
+        finally:
+            manager.pop()
+    
+    def test_global(self):
+        from zope.component import getGlobalSiteManager
+        self.assertEqual(self._callFUT(), getGlobalSiteManager())
+