From b2f58207a4365d9886e6293539b1aad9c5ca8183 Mon Sep 17 00:00:00 2001 From: Daniel Grana Date: Fri, 14 May 2010 20:09:07 +0100 Subject: [PATCH] avoid different behaviour in urljoin between pytho2.5 and python2.6+. see http://bugs.python.org/issue1432 --- scrapy/utils/url.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scrapy/utils/url.py b/scrapy/utils/url.py index e24773e2c..196c03727 100644 --- a/scrapy/utils/url.py +++ b/scrapy/utils/url.py @@ -106,7 +106,7 @@ def url_query_cleaner(url, parameterlist=(), sep='&', kvsep='=', remove=False, u else: querylist.append(ksv) seen.add(k) - return urlparse.urljoin(base, '?'+sep.join(querylist)) + return '?'.join([base, sep.join(querylist)]) if querylist else base def add_or_replace_parameter(url, name, new_value, sep='&', url_is_quoted=False): """Add or remove a parameter to a given url"""