diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-06-21 22:35:16 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-06-21 22:35:16 +0000 |
| commit | 352276d69311cbd2ec4985b4e809b607102c2dab (patch) | |
| tree | 7f26057510768145df9bd98257c793e56cb7e344 /repoze/bfg/traversal.py | |
| parent | 5e939a9a86f42318f1e92419cec23f49ec5b76f6 (diff) | |
| download | pyramid-352276d69311cbd2ec4985b4e809b607102c2dab.tar.gz pyramid-352276d69311cbd2ec4985b4e809b607102c2dab.tar.bz2 pyramid-352276d69311cbd2ec4985b4e809b607102c2dab.zip | |
Make urldispatch put matchdict into environ.
Traverser no longer returns matchdict.
Diffstat (limited to 'repoze/bfg/traversal.py')
| -rw-r--r-- | repoze/bfg/traversal.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py index 350c1098f..576679853 100644 --- a/repoze/bfg/traversal.py +++ b/repoze/bfg/traversal.py @@ -493,7 +493,6 @@ class ModelGraphTraverser(object): self.root = root def __call__(self, environ, _marker=_marker): - matchdict = None if 'bfg.routes.matchdict' in environ: matchdict = environ['bfg.routes.matchdict'] path = matchdict.get('traverse', '/') @@ -528,22 +527,19 @@ class ModelGraphTraverser(object): if segment[:2] =='@@': return dict(context=ob, view_name=segment[2:], subpath=path[i:], traversed=traversed, virtual_root=vroot, - virtual_root_path=vroot_path, root=self.root, - matchdict=matchdict) + virtual_root_path=vroot_path, root=self.root) try: getitem = ob.__getitem__ except AttributeError: return dict(context=ob, view_name=segment, subpath=path[i:], traversed=traversed, virtual_root=vroot, - virtual_root_path=vroot_path, root=self.root, - matchdict=matchdict) + virtual_root_path=vroot_path, root=self.root) try: next = getitem(segment) except KeyError: return dict(context=ob, view_name=segment, subpath=path[i:], traversed=traversed, virtual_root=vroot, - virtual_root_path=vroot_path, root=self.root, - matchdict=matchdict) + virtual_root_path=vroot_path, root=self.root) if vroot_idx == i-1: vroot = ob traversed.append(segment) @@ -553,7 +549,7 @@ class ModelGraphTraverser(object): return dict(context=ob, view_name=u'', subpath=subpath, traversed=traversed, virtual_root=vroot, virtual_root_path=vroot_path, - root=self.root, matchdict=matchdict) + root=self.root) class TraversalContextURL(object): """ The IContextURL adapter used to generate URLs for a context |