Disuse ZCA threadlocal API.

1 files changed, 18 insertions, 14 deletions

diff --git a/repoze/bfg/tests/test_chameleon_zpt.py b/repoze/bfg/tests/test_chameleon_zpt.py
index 0a78c1caa..38ef543cf 100644
--- a/repoze/bfg/tests/test_chameleon_zpt.py
+++ b/repoze/bfg/tests/test_chameleon_zpt.py
@@ -15,10 +15,10 @@ class Base(object):
         return os.path.join(here, 'fixtures', name)
 
     def _registerUtility(self, utility, iface, name=''):
-        from zope.component import getSiteManager
-        sm = getSiteManager()
-        sm.registerUtility(utility, iface, name=name)
-        return sm
+        from repoze.bfg.threadlocal import get_current_registry
+        reg = get_current_registry()
+        reg.registerUtility(utility, iface, name=name)
+        return reg
         
 class ZPTTemplateRendererTests(Base, unittest.TestCase):
     def _getTargetClass(self):
@@ -105,7 +105,7 @@ class GetRendererTests(Base, unittest.TestCase):
         return get_renderer(name)
 
     def test_nonabs_registered(self):
-        from zope.component import queryUtility
+        from repoze.bfg.threadlocal import get_current_registry
         from repoze.bfg.chameleon_zpt import ZPTTemplateRenderer
         from repoze.bfg.interfaces import ITemplateRenderer
         minimal = self._getTemplatePath('minimal.pt')
@@ -113,19 +113,21 @@ class GetRendererTests(Base, unittest.TestCase):
         self._registerUtility(utility, ITemplateRenderer, name=minimal)
         result = self._callFUT(minimal)
         self.assertEqual(result, utility)
-        self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
+        reg = get_current_registry()
+        self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), utility)
         
     def test_nonabs_unregistered(self):
-        from zope.component import queryUtility
+        from repoze.bfg.threadlocal import get_current_registry
         from repoze.bfg.chameleon_zpt import ZPTTemplateRenderer
         from repoze.bfg.interfaces import ITemplateRenderer
         minimal = self._getTemplatePath('minimal.pt')
-        self.assertEqual(queryUtility(ITemplateRenderer, minimal), None)
+        reg = get_current_registry()
+        self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), None)
         utility = ZPTTemplateRenderer(minimal)
         self._registerUtility(utility, ITemplateRenderer, name=minimal)
         result = self._callFUT(minimal)
         self.assertEqual(result, utility)
-        self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
+        self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), utility)
 
     def test_explicit_registration(self):
         from repoze.bfg.interfaces import ITemplateRenderer
@@ -142,7 +144,7 @@ class GetTemplateTests(Base, unittest.TestCase):
         return get_template(name)
 
     def test_nonabs_registered(self):
-        from zope.component import queryUtility
+        from repoze.bfg.threadlocal import get_current_registry
         from repoze.bfg.chameleon_zpt import ZPTTemplateRenderer
         from repoze.bfg.interfaces import ITemplateRenderer
         minimal = self._getTemplatePath('minimal.pt')
@@ -150,19 +152,21 @@ class GetTemplateTests(Base, unittest.TestCase):
         self._registerUtility(utility, ITemplateRenderer, name=minimal)
         result = self._callFUT(minimal)
         self.assertEqual(result.filename, minimal)
-        self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
+        reg = get_current_registry()
+        self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), utility)
         
     def test_nonabs_unregistered(self):
-        from zope.component import queryUtility
+        from repoze.bfg.threadlocal import get_current_registry
         from repoze.bfg.chameleon_zpt import ZPTTemplateRenderer
         from repoze.bfg.interfaces import ITemplateRenderer
         minimal = self._getTemplatePath('minimal.pt')
-        self.assertEqual(queryUtility(ITemplateRenderer, minimal), None)
+        reg = get_current_registry()
+        self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), None)
         utility = ZPTTemplateRenderer(minimal)
         self._registerUtility(utility, ITemplateRenderer, name=minimal)
         result = self._callFUT(minimal)
         self.assertEqual(result.filename, minimal)
-        self.assertEqual(queryUtility(ITemplateRenderer, minimal), utility)
+        self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), utility)
 
     def test_explicit_registration(self):
         from repoze.bfg.interfaces import ITemplateRenderer