Remove dependencies on zope.deferredimport. zope.deferredimport was

only used as a deprecation mechanism, so where possible we've kept around
the deprecation warnings and we've used zope.deprectation instead.  However,
when cross-module deprecations were included, rather than introducing a
cyclic dependency, we just removed the deprecation itself.

As a result:

- Since version 0.6.1, a deprecation warning has been emitted when the
  name ``model_url`` is imported from the ``repoze.bfg.traversal``
  module.  This import alias (and the deprecation warning) has been
  removed.  Any import of the ``model_url`` function will now need to
  be done from ``repoze.bfg.url``; any import of the name
  ``model_url`` from ``repoze.bfg.traversal`` will now fail.  This was
  done to remove a dependency on zope.deferredimport.

- Since version 0.6.5, a deprecation warning has been emitted when the
  name ``RoutesModelTraverser`` is imported from the
  ``repoze.bfg.traversal`` module.  This import alias (and the
  deprecation warning) has been removed.  Any import of the
  ``RoutesModelTraverser`` class will now need to be done from
  ``repoze.bfg.urldispatch``; any import of the name
  ``RoutesModelTraverser`` from ``repoze.bfg.traversal`` will now
  fail.  This was done to remove a dependency on zope.deferredimport.

1 files changed, 7 insertions, 5 deletions

diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index 41012a7c9..f73e131d5 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -8,20 +8,22 @@ from zope.component.interfaces import ComponentLookupError
 from zope.component.interfaces import IComponentLookup
 from zope.component.registry import Components
 
-from zope.deferredimport import deprecated
+from zope.deprecation import deprecated
 
 from repoze.bfg.zcml import zcml_configure
 
-deprecated(
+from repoze.bfg.settings import Settings  # alias for deprecation below
+
+deprecated('Settings',
     "('from repoze.bfg.registry import Settings' is now "
     "deprecated; instead use 'from repoze.bfg.settings import Settings')",
-    Settings = "repoze.bfg.settings:Settings",
     )
 
-deprecated(
+from repoze.bfg.settings import get_options # alias for deprecation below
+
+deprecated('get_options',
     "('from repoze.bfg.registry import get_options' is now "
     "deprecated; instead use 'from repoze.bfg.settings import get_options')",
-    get_options = "repoze.bfg.settings:get_options",
     )
 
 class Registry(Components):