diff options
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | repoze/bfg/tests/test_registry.py | 5 | ||||
| -rw-r--r-- | repoze/bfg/threadlocal.py | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 78c5938f2..071b7f2df 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Next Release ============ +Removals +-------- + +- Remove ``repoze.bfg.threadlocal.setManager``. It was only used in + unit tests. + Documentation ------------- diff --git a/repoze/bfg/tests/test_registry.py b/repoze/bfg/tests/test_registry.py index 5a4746c23..c2ed82f7e 100644 --- a/repoze/bfg/tests/test_registry.py +++ b/repoze/bfg/tests/test_registry.py @@ -56,7 +56,8 @@ class TestPopulateRegistry(unittest.TestCase): dummyregmgr = DummyThreadLocalManager({'registry':None}) import repoze.bfg.threadlocal try: - old = repoze.bfg.threadlocal.setManager(dummyregmgr) + old = repoze.bfg.threadlocal.manager + repoze.bfg.threadlocal.manager = dummyregmgr from zope.component.registry import Components registry = Components('hello') self._callFUT(registry, @@ -67,7 +68,7 @@ class TestPopulateRegistry(unittest.TestCase): self.assertEqual(dummylock.released, True) self.assertEqual(dummyregmgr.data['registry'], None) finally: - repoze.bfg.threadlocal.setManager(old) + repoze.bfg.threadlocal.manager = old class GetSiteManagerTests(unittest.TestCase): def _callFUT(self, context=None): diff --git a/repoze/bfg/threadlocal.py b/repoze/bfg/threadlocal.py index 7df4f34f4..b35be187b 100644 --- a/repoze/bfg/threadlocal.py +++ b/repoze/bfg/threadlocal.py @@ -32,8 +32,3 @@ def defaults(): manager = ThreadLocalManager(defaults) -def setManager(new_manager): # for unit tests - global manager - old_manager = manager - manager = new_manager - return old_manager |