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, 10 insertions, 24 deletions

diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py
index 9da1818fc..572c31e74 100644
--- a/repoze/bfg/traversal.py
+++ b/repoze/bfg/traversal.py
@@ -4,8 +4,8 @@ import urllib
 from zope.component import getMultiAdapter
 from zope.component import queryUtility
 
-from zope.deferredimport import deprecated
-   
+from zope.deprecation import deprecated
+
 from zope.interface import classProvides
 from zope.interface import implements
 
@@ -19,28 +19,6 @@ from repoze.bfg.interfaces import ITraverserFactory
 from repoze.bfg.interfaces import VH_ROOT_KEY
 from repoze.bfg.interfaces import ILogger
 
-deprecated(
-    "('from repoze.bfg.traversal import model_url' is now "
-    "deprecated; instead use 'from repoze.bfg.url import model_url')",
-    model_url = "repoze.bfg.url:model_url",
-    )
-
-deprecated(
-    "('from repoze.bfg.traversal import RoutesModelTraverser' is now "
-    "deprecated; instead use 'from repoze.bfg.urldispatch "
-    "import RoutesModelTraverser')",
-    RoutesModelTraverser = "repoze.bfg.urldispatch:RoutesModelTraverser",
-    )
-
-# ``split_path`` wasn't actually ever an API but people were using it
-# anyway.  I turned it into the ``traversal_path`` API in 0.6.5, and
-# generate the below deprecation to give folks a heads up.
-deprecated(
-    "('from repoze.bfg.traversal import split_path' is now deprecated; "
-    "instead use 'from repoze.bfg.traversal import traversal_path')",
-    split_path = "repoze.bfg.traversal:traversal_path",
-    )
-
 def find_root(model):
     """ Find the root node in the graph to which ``model``
     belongs. Note that ``model`` should be :term:`location`-aware.
@@ -331,6 +309,14 @@ def traversal_path(path):
             clean.append(segment)
     return tuple(clean)
 
+# ``split_path`` wasn't actually ever an API but people were using it
+# anyway.  I turned it into the ``traversal_path`` API in 0.6.5, and
+# generate the below deprecation to give folks a heads up.
+deprecated('split_path',
+    "('from repoze.bfg.traversal import split_path' is now deprecated; "
+    "instead use 'from repoze.bfg.traversal import traversal_path')",
+    )
+
 _segment_cache = {}
 
 def quote_path_segment(segment):