diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-10-26 13:42:24 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-10-26 13:42:24 +0000 |
| commit | 517d037fdb5a6cd86b2fa09296d0d39f982605ca (patch) | |
| tree | 6a3c478ac7d048b11a970f1ae3be419e72842690 | |
| parent | 0a0ffe0b01e81e2fd55e92a818187d3b3b294605 (diff) | |
| download | pyramid-517d037fdb5a6cd86b2fa09296d0d39f982605ca.tar.gz pyramid-517d037fdb5a6cd86b2fa09296d0d39f982605ca.tar.bz2 pyramid-517d037fdb5a6cd86b2fa09296d0d39f982605ca.zip | |
Readd backward compat for ITraverserFactory -> ITraverser change.
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | repoze/bfg/interfaces.py | 4 | ||||
| -rw-r--r-- | repoze/bfg/traversal.py | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index b4c04304e..06653cf09 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -55,10 +55,6 @@ Backwards Incompatibilities - The ``authtkt`` authentication policy ``remember`` method now no longer honors ``token`` or ``userdata`` keyword arguments. -- The traversal machinery now adapts to ``ITraverser`` instead of - ``ITraverserFactory``, matching the expectation that adaptation - returns an object which implements the required interface. - Internal -------- @@ -87,6 +83,8 @@ Internal to support the ``reissue_time`` feature of the authtkt authentication policy. +- The interface ITraverserFactory is now just an alias for ITraverser. + 1.1a7 (2009-10-18) ================== diff --git a/repoze/bfg/interfaces.py b/repoze/bfg/interfaces.py index ad61ac9e5..53b01bfd6 100644 --- a/repoze/bfg/interfaces.py +++ b/repoze/bfg/interfaces.py @@ -80,9 +80,7 @@ class ITraverser(Interface): as attributes of the ``request`` object. """ -class ITraverserFactory(Interface): - def __call__(context): - """ Return an object that implements ITraverser """ +ITraverserFactory = ITraverser # b / c for 1.0 code class IRenderer(Interface): def __call__(value, system): diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py index 11e5ca806..48d7ef1c1 100644 --- a/repoze/bfg/traversal.py +++ b/repoze/bfg/traversal.py @@ -3,7 +3,6 @@ import urllib from zope.component import queryMultiAdapter from zope.component import queryAdapter -from zope.interface import classProvides from zope.interface import implements from zope.interface.interfaces import IInterface @@ -11,7 +10,6 @@ from repoze.lru import lru_cache from repoze.bfg.interfaces import IContextURL from repoze.bfg.interfaces import ITraverser -from repoze.bfg.interfaces import ITraverserFactory from repoze.bfg.interfaces import VH_ROOT_KEY from repoze.bfg.location import lineage @@ -474,7 +472,6 @@ class ModelGraphTraverser(object): every object in the graph supplies a ``__name__`` and ``__parent__`` attribute (ie. every object 'provides ILocation') .""" - classProvides(ITraverserFactory) implements(ITraverser) def __init__(self, root): |