From bab1904e297b056351327a207589fb051a412eca Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 23 Nov 2009 05:25:01 +0000 Subject: Disuse ZCA threadlocal API. --- repoze/bfg/testing.py | 3 +-- repoze/bfg/tests/test_chameleon_text.py | 32 ++++++++++++++++++-------------- repoze/bfg/tests/test_chameleon_zpt.py | 32 ++++++++++++++++++-------------- repoze/bfg/tests/test_integration.py | 6 +++--- repoze/bfg/tests/test_renderers.py | 10 ++++++---- repoze/bfg/tests/test_resource.py | 6 +++--- repoze/bfg/tests/test_settings.py | 6 +++--- 7 files changed, 52 insertions(+), 43 deletions(-) diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py index def8c6aea..f12f5b110 100644 --- a/repoze/bfg/testing.py +++ b/repoze/bfg/testing.py @@ -1,5 +1,6 @@ import copy +from zope.component import getSiteManager from zope.configuration.xmlconfig import _clearContext from zope.deprecation import deprecated @@ -532,7 +533,6 @@ def setUp(): .. note:: This feature is new as of :mod:`repoze.bfg` 1.1. """ from repoze.bfg.registry import Registry - from zope.component import getSiteManager registry = Registry('testing') manager.clear() request = DummyRequest() @@ -553,7 +553,6 @@ def tearDown(): .. note:: This feature is new as of :mod:`repoze.bfg` 1.1. """ - from zope.component import getSiteManager getSiteManager.reset() manager.pop() diff --git a/repoze/bfg/tests/test_chameleon_text.py b/repoze/bfg/tests/test_chameleon_text.py index a0fb946d1..54ffc8b10 100644 --- a/repoze/bfg/tests/test_chameleon_text.py +++ b/repoze/bfg/tests/test_chameleon_text.py @@ -21,10 +21,10 @@ class Base: 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 TextTemplateRendererTests(Base, unittest.TestCase): @@ -114,7 +114,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_text import TextTemplateRenderer from repoze.bfg.interfaces import ITemplateRenderer minimal = self._getTemplatePath('minimal.txt') @@ -122,19 +122,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_text import TextTemplateRenderer from repoze.bfg.interfaces import ITemplateRenderer minimal = self._getTemplatePath('minimal.txt') - self.assertEqual(queryUtility(ITemplateRenderer, minimal), None) + reg = get_current_registry() + self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), None) utility = TextTemplateRenderer(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 @@ -157,7 +159,7 @@ class GetTemplateTests(unittest.TestCase, Base): 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_text import TextTemplateRenderer from repoze.bfg.interfaces import ITemplateRenderer minimal = self._getTemplatePath('minimal.txt') @@ -165,19 +167,21 @@ class GetTemplateTests(unittest.TestCase, Base): 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_text import TextTemplateRenderer from repoze.bfg.interfaces import ITemplateRenderer minimal = self._getTemplatePath('minimal.txt') - self.assertEqual(queryUtility(ITemplateRenderer, minimal), None) + reg = get_current_registry() + self.assertEqual(reg.queryUtility(ITemplateRenderer, minimal), None) utility = TextTemplateRenderer(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 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 diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py index 9175efe4c..48a089f6f 100644 --- a/repoze/bfg/tests/test_integration.py +++ b/repoze/bfg/tests/test_integration.py @@ -35,7 +35,7 @@ class WGSIAppPlusBFGViewTests(unittest.TestCase): self.assertEqual(result, '123') def test_scanned(self): - from zope.component import getSiteManager + from repoze.bfg.threadlocal import get_current_registry from repoze.bfg.interfaces import IRequest from repoze.bfg.interfaces import IView from repoze.bfg.zcml import scan @@ -44,8 +44,8 @@ class WGSIAppPlusBFGViewTests(unittest.TestCase): scan(context, test_integration) actions = context.actions context.actions[-1]['callable']() - sm = getSiteManager() - view = sm.adapters.lookup((INothing, IRequest), IView, name='') + reg = get_current_registry() + view = reg.adapters.lookup((INothing, IRequest), IView, name='') self.assertEqual(view, wsgiapptest) here = os.path.dirname(__file__) diff --git a/repoze/bfg/tests/test_renderers.py b/repoze/bfg/tests/test_renderers.py index d94ffbc1e..c368228df 100644 --- a/repoze/bfg/tests/test_renderers.py +++ b/repoze/bfg/tests/test_renderers.py @@ -84,7 +84,7 @@ class TestTemplateRendererFactory(unittest.TestCase): self.assertEqual(factory.kw, {}) def test_reload_resources_true(self): - from zope.component import queryUtility + from repoze.bfg.threadlocal import get_current_registry from repoze.bfg.interfaces import ISettings from repoze.bfg.interfaces import ITemplateRenderer settings = {'reload_resources':True} @@ -94,11 +94,12 @@ class TestTemplateRendererFactory(unittest.TestCase): result = self._callFUT('repoze.bfg.tests:test_renderers.py', factory) self.failUnless(result is renderer) spec = '%s:%s' % ('repoze.bfg.tests', 'test_renderers.py') - self.assertEqual(queryUtility(ITemplateRenderer, name=spec), + reg = get_current_registry() + self.assertEqual(reg.queryUtility(ITemplateRenderer, name=spec), None) def test_reload_resources_false(self): - from zope.component import queryUtility + from repoze.bfg.threadlocal import get_current_registry from repoze.bfg.interfaces import ISettings from repoze.bfg.interfaces import ITemplateRenderer settings = {'reload_resources':False} @@ -108,7 +109,8 @@ class TestTemplateRendererFactory(unittest.TestCase): result = self._callFUT('repoze.bfg.tests:test_renderers.py', factory) self.failUnless(result is renderer) spec = '%s:%s' % ('repoze.bfg.tests', 'test_renderers.py') - self.assertNotEqual(queryUtility(ITemplateRenderer, name=spec), + reg = get_current_registry() + self.assertNotEqual(reg.queryUtility(ITemplateRenderer, name=spec), None) class TestRendererFromName(unittest.TestCase): diff --git a/repoze/bfg/tests/test_resource.py b/repoze/bfg/tests/test_resource.py index f14d9860d..9fee4f359 100644 --- a/repoze/bfg/tests/test_resource.py +++ b/repoze/bfg/tests/test_resource.py @@ -18,9 +18,9 @@ class TestOverrideProvider(unittest.TestCase): def _registerOverrides(self, overrides, name='repoze.bfg.tests'): from repoze.bfg.interfaces import IPackageOverrides - from zope.component import getSiteManager - sm = getSiteManager() - sm.registerUtility(overrides, IPackageOverrides, name=name) + from repoze.bfg.threadlocal import get_current_registry + reg = get_current_registry() + reg.registerUtility(overrides, IPackageOverrides, name=name) def test_get_resource_filename_no_overrides(self): import os diff --git a/repoze/bfg/tests/test_settings.py b/repoze/bfg/tests/test_settings.py index faa1f924f..49e71863e 100644 --- a/repoze/bfg/tests/test_settings.py +++ b/repoze/bfg/tests/test_settings.py @@ -155,10 +155,10 @@ class TestGetSettings(unittest.TestCase): self.assertEqual(self._callFUT(), None) def test_it_withsettings(self): - from zope.component import getSiteManager from repoze.bfg.interfaces import ISettings - sm = getSiteManager() + from repoze.bfg.threadlocal import get_current_registry + reg = get_current_registry() settings = {'a':1} - sm.registerUtility(settings, ISettings) + reg.registerUtility(settings, ISettings) self.assertEqual(self._callFUT(), settings) -- cgit v1.2.3