diff options
| author | Chris McDonough <chrism@agendaless.com> | 2008-09-08 23:31:24 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2008-09-08 23:31:24 +0000 |
| commit | cf3fcd572e9d55a21b24a55b542bdefdc8f37d94 (patch) | |
| tree | 6ccb0d87f5ee8c62936a6df5a9caeda4528681f9 | |
| parent | 5e91eb5c0da7e411a782768477c9edc847d34e4d (diff) | |
| download | pyramid-cf3fcd572e9d55a21b24a55b542bdefdc8f37d94.tar.gz pyramid-cf3fcd572e9d55a21b24a55b542bdefdc8f37d94.tar.bz2 pyramid-cf3fcd572e9d55a21b24a55b542bdefdc8f37d94.zip | |
- ``repoze.bfg.traversal.find_model`` function did not function
properly.
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | repoze/bfg/tests/test_traversal.py | 14 | ||||
| -rw-r--r-- | repoze/bfg/traversal.py | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 13364e3fd..fdec22ddd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,10 @@ +Next release + + Bug fixes + + - ``repoze.bfg.traversal.find_model`` function did not function + properly. + 0.3.6 (09/04/2008) Features diff --git a/repoze/bfg/tests/test_traversal.py b/repoze/bfg/tests/test_traversal.py index eba543cdb..8034cf39b 100644 --- a/repoze/bfg/tests/test_traversal.py +++ b/repoze/bfg/tests/test_traversal.py @@ -210,19 +210,19 @@ class FindModelTests(unittest.TestCase): from repoze.bfg.traversal import find_model return find_model - def _registerTraverser(self, traverser): + def _registerTraverserFactory(self, traverser): import zope.component gsm = zope.component.getGlobalSiteManager() - from repoze.bfg.interfaces import ITraverser + from repoze.bfg.interfaces import ITraverserFactory from zope.interface import Interface - gsm.registerAdapter(traverser, (Interface,), ITraverser) + gsm.registerAdapter(traverser, (Interface,), ITraverserFactory) def test_relative_found(self): dummy = DummyContext() baz = DummyContext() find = self._getFUT() traverser = make_traverser(baz, '', []) - self._registerTraverser(traverser) + self._registerTraverserFactory(traverser) result = find(dummy, 'baz') self.assertEqual(result, baz) @@ -231,7 +231,7 @@ class FindModelTests(unittest.TestCase): baz = DummyContext() find = self._getFUT() traverser = make_traverser(baz, 'bar', []) - self._registerTraverser(traverser) + self._registerTraverserFactory(traverser) self.assertRaises(KeyError, find, dummy, 'baz') def test_absolute_found(self): @@ -243,7 +243,7 @@ class FindModelTests(unittest.TestCase): dummy.__name__ = None find = self._getFUT() traverser = make_traverser(dummy, '', []) - self._registerTraverser(traverser) + self._registerTraverserFactory(traverser) result = find(baz, '/') self.assertEqual(result, dummy) self.assertEqual(dummy.wascontext, True) @@ -257,7 +257,7 @@ class FindModelTests(unittest.TestCase): dummy.__name__ = None find = self._getFUT() traverser = make_traverser(dummy, 'fuz', []) - self._registerTraverser(traverser) + self._registerTraverserFactory(traverser) self.assertRaises(KeyError, find, baz, '/') self.assertEqual(dummy.wascontext, True) diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py index dcbecf2ff..9783955de 100644 --- a/repoze/bfg/traversal.py +++ b/repoze/bfg/traversal.py @@ -89,7 +89,7 @@ def find_model(model, path): if path.startswith('/'): model = find_root(model) - ob, name, path = ITraverser(model)({'PATH_INFO':path}) + ob, name, path = ITraverserFactory(model)({'PATH_INFO':path}) if name: raise KeyError('%r has no subelement %s' % (ob, name)) return ob |