diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-01-27 22:58:55 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-01-27 22:58:55 +0000 |
| commit | da442da2870550f05c0d12a639e1a55315421c29 (patch) | |
| tree | 1b90b4a794048f2a2e6293e5de899e99669b8099 | |
| parent | bc4faa0d8d6c892816b64581757a13fb8f891758 (diff) | |
| download | pyramid-da442da2870550f05c0d12a639e1a55315421c29.tar.gz pyramid-da442da2870550f05c0d12a639e1a55315421c29.tar.bz2 pyramid-da442da2870550f05c0d12a639e1a55315421c29.zip | |
D'oh; I don't want to break all the tests in apps that rely on the old behavior.
| -rw-r--r-- | repoze/bfg/url.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/repoze/bfg/url.py b/repoze/bfg/url.py index 9ea82ed7a..5c520fe4a 100644 --- a/repoze/bfg/url.py +++ b/repoze/bfg/url.py @@ -3,7 +3,7 @@ import re import urllib -from zope.component import getMultiAdapter +from zope.component import queryMultiAdapter from repoze.bfg.interfaces import IContextURL from repoze.bfg.interfaces import VH_ROOT_KEY @@ -56,7 +56,11 @@ def model_url(model, request, *elements, **kw): string for each value. """ % VH_ROOT_KEY - context_url = getMultiAdapter((model, request), IContextURL) + context_url = queryMultiAdapter((model, request), IContextURL) + if context_url is None: + # b/w compat for unit tests + from repoze.bfg.traversal import TraversalContextURL + context_url = TraversalContextURL(model, request) model_url = context_url() if 'query' in kw: |