summaryrefslogtreecommitdiff
path: root/repoze/bfg/traversal.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-10-26 13:38:21 +0000
committerChris McDonough <chrism@agendaless.com>2009-10-26 13:38:21 +0000
commit0a0ffe0b01e81e2fd55e92a818187d3b3b294605 (patch)
tree2a5b77b435e343847ed24644c150599b69296916 /repoze/bfg/traversal.py
parent0d13f6596c2cf38a611183e01a7f73173d5d6faa (diff)
downloadpyramid-0a0ffe0b01e81e2fd55e92a818187d3b3b294605.tar.gz
pyramid-0a0ffe0b01e81e2fd55e92a818187d3b3b294605.tar.bz2
pyramid-0a0ffe0b01e81e2fd55e92a818187d3b3b294605.zip
Revert 6873, as it introduces an unnecessary providedBy for each request in the 99% case, and its behavior can be emulated by returning a root object that implements some interface and registering a traverser for that interface.
Diffstat (limited to 'repoze/bfg/traversal.py')
-rw-r--r--repoze/bfg/traversal.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py
index 580225566..11e5ca806 100644
--- a/repoze/bfg/traversal.py
+++ b/repoze/bfg/traversal.py
@@ -273,12 +273,9 @@ def traverse(model, path):
return _traverse(model, {'PATH_INFO':path})
def _traverse(model, environ):
- if ITraverser.providedBy(model):
- traverser = model
- else:
- traverser = queryAdapter(model, ITraverser)
- if traverser is None:
- traverser = ModelGraphTraverser(model)
+ traverser = queryAdapter(model, ITraverser)
+ if traverser is None:
+ traverser = ModelGraphTraverser(model)
result = traverser(environ)
return result