From 94da801721dc65110cb94a25d75f6200adf3d125 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 23 Sep 2009 11:39:51 +0000 Subject: Undo the last commit; it breaks tests (and KARL). --- repoze/bfg/url.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'repoze') 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 = '' -- cgit v1.2.3