summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt4
-rw-r--r--repoze/bfg/url.py5
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 = ''