diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-09-23 11:39:51 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-09-23 11:39:51 +0000 |
| commit | 94da801721dc65110cb94a25d75f6200adf3d125 (patch) | |
| tree | 1852fdd152054e2a13d9e94c7a4f7ecce34dddcc | |
| parent | 5889c34b64fc5197f38f6f6c6d73bc3265152d44 (diff) | |
| download | pyramid-94da801721dc65110cb94a25d75f6200adf3d125.tar.gz pyramid-94da801721dc65110cb94a25d75f6200adf3d125.tar.bz2 pyramid-94da801721dc65110cb94a25d75f6200adf3d125.zip | |
Undo the last commit; it breaks tests (and KARL).
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | repoze/bfg/url.py | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 95ca8e3e2..96f5a8355 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,10 +15,6 @@ Features - Speed up ``repoze.bfg.traversal.traverse`` slightly. -- Speed up ``repoze.bfg.url.model_url`` slightly. - -- Speed up ``repoze.bfg.url.route_url`` slightly. - Internal -------- diff --git a/repoze/bfg/url.py b/repoze/bfg/url.py index 0583fb3f4..1fd9bab1e 100644 --- a/repoze/bfg/url.py +++ b/repoze/bfg/url.py @@ -13,7 +13,6 @@ from repoze.bfg.path import caller_package from repoze.bfg.static import StaticRootFactory from repoze.bfg.traversal import TraversalContextURL from repoze.bfg.traversal import quote_path_segment -from repoze.bfg.traversal import _join_path_tuple def route_url(route_name, request, *elements, **kw): """Generates a fully qualified URL for a named BFG route. @@ -104,7 +103,7 @@ def route_url(route_name, request, *elements, **kw): anchor = '#' + anchor if elements: - suffix = _join_path_tuple(elements) + suffix = '/'.join([quote_path_segment(s) for s in elements]) if not path.endswith('/'): suffix = '/' + suffix else: @@ -195,7 +194,7 @@ def model_url(model, request, *elements, **kw): anchor = '#' + anchor if elements: - suffix = _join_path_tuple(elements) + suffix = '/'.join([quote_path_segment(s) for s in elements]) else: suffix = '' |