diff options
Diffstat (limited to 'repoze/bfg/urldispatch.py')
| -rw-r--r-- | repoze/bfg/urldispatch.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py index 96650f9a5..526db3a9a 100644 --- a/repoze/bfg/urldispatch.py +++ b/repoze/bfg/urldispatch.py @@ -15,28 +15,22 @@ from repoze.bfg.interfaces import IRoutesContext from repoze.bfg.interfaces import ITraverser from repoze.bfg.interfaces import ITraverserFactory -from zope.deferredimport import deprecated -from zope.deprecation import deprecated as deprecated2 +from zope.deprecation import deprecated _marker = () -deprecated( - "('from repoze.bfg.urldispatch import RoutesContext' is now " - "deprecated; instead use 'from repoze.bfg.urldispatch import " - "DefaultRoutesContext')", - RoutesContext = "repoze.bfg.urldispatch:DefaultRoutesContext", - ) - -deprecated2('RoutesMapper', - 'Usage of the ``RoutesMapper`` class is deprecated. As of ' - 'repoze.bfg 0.6.3, you should use the ``<route.. >`` ZCML ' - 'directive instead of manually creating a RoutesMapper.') - class DefaultRoutesContext(object): implements(IRoutesContext) def __init__(self, **kw): self.__dict__.update(kw) +RoutesContext = DefaultRoutesContext +deprecated('RoutesContext', + "('from repoze.bfg.urldispatch import RoutesContext' is now " + "deprecated; instead use 'from repoze.bfg.urldispatch import " + "DefaultRoutesContext')", + ) + class RoutesMapper(object): """ The ``RoutesMapper`` is a wrapper for the ``get_root`` callable passed in to the repoze.bfg ``Router`` at initialization @@ -110,6 +104,12 @@ class RoutesMapper(object): self.mapper.connect(*arg, **kw) +deprecated('RoutesMapper', + 'Usage of the ``RoutesMapper`` class is deprecated. As of ' + 'repoze.bfg 0.6.3, you should use the ``<route.. >`` ZCML ' + 'directive instead of manually creating a RoutesMapper.', + ) + class RoutesContextNotFound(object): implements(IContextNotFound) def __init__(self, msg): |