- The ``registry_manager`` backwards compatibility alias importable

  from "repoze.bfg.registry", deprecated since repoze.bfg 0.9 has been
  removed.  If you are tring to use the registry manager within a
  debug script of your own, use a combination of the
  "repoze.bfg.paster.get_app" and "repoze.bfg.scripting.get_root" APIs
  instead.

3 files changed, 7 insertions, 63 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 232ba1c27..f2c5739af 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
 Next release
 ============
 
+- The ``registry_manager`` backwards compatibility alias importable
+  from "repoze.bfg.registry", deprecated since repoze.bfg 0.9 has been
+  removed.  If you are tring to use the registry manager within a
+  debug script of your own, use a combination of the
+  "repoze.bfg.paster.get_app" and "repoze.bfg.scripting.get_root" APIs
+  instead.
+
 - The ``IViewPermissionFactory`` interface has been removed.  This was
   never an API.
 
diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index bc52e297b..50aa1b268 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -63,35 +63,6 @@ def populateRegistry(registry, filename, package, lock=threading.Lock(),
         lock.release()
         manager.pop()
 
-class FakeRegistryManager(object):
-    manager = manager # for unit tests
-    def push(self, registry):
-        return self.manager.push({'registry':registry, 'request':None})
-
-    set = push # b/c
-
-    def pop(self):
-        result = self.manager.pop()
-        if result:
-            return result['registry']
-
-    def get(self):
-        return self.manager.get()['registry']
-
-    def clear(self):
-        self.manager.clear()
-
-# for use in scripts for backwards compatibility *only*!
-registry_manager = FakeRegistryManager() 
-    
-deprecated('registry_manager',
-           'As of repoze.bfg 0.9, any import of registry_manager from'
-           '``repoze.bfg.registry`` is '
-           'deprecated.  If you are trying to use the registry manager '
-           'within a "debug" script of your own making, use the ``bfgshell`` '
-           'paster command instead. ``registry_manager`` will disappear in '
-           'a later release of repoze.bfg')
-
 getSiteManager = get_current_registry # b/c
 
 deprecated('getSiteManager',
diff --git a/repoze/bfg/tests/test_registry.py b/repoze/bfg/tests/test_registry.py
index 1d29aef73..c99c558e5 100644
--- a/repoze/bfg/tests/test_registry.py
+++ b/repoze/bfg/tests/test_registry.py
@@ -65,40 +65,6 @@ class TestPopulateRegistry(unittest.TestCase):
         self.assertEqual(dummylock.released, True)
         self.assertEqual(dummyregmgr.data['registry'], None)
 
-class TestFakeRegistry(unittest.TestCase):
-    def _getTargetClass(self):
-        from repoze.bfg.registry import FakeRegistryManager
-        return FakeRegistryManager
-
-    def _makeOne(self):
-        manager = self._getTargetClass()()
-        manager.manager = DummyThreadLocalManager({'registry':None,
-                                                   'request':None})
-        return manager
-
-    def test_push(self):
-        manager = self._makeOne()
-        result = manager.push(1)
-        self.assertEqual(manager.manager.pushed, {'registry':1,
-                                                  'request':None})
-
-    def test_pop(self):
-        manager = self._makeOne()
-        result = manager.pop()
-        self.assertEqual(manager.manager.popped, True)
-        self.assertEqual(result, None)
-
-    def test_get(self):
-        manager = self._makeOne()
-        result = manager.get()
-        self.assertEqual(result, None)
-
-    def test_clear(self):
-        manager = self._makeOne()
-        manager.clear()
-        self.assertEqual(manager.manager.cleared, True)
-        
-        
 class DummyThreadLocalManager:
     def __init__(self, data):
         self.data = data