From 1ba98606c226005e3205d9459e05c0e334b94e24 Mon Sep 17 00:00:00 2001 From: damian Date: Tue, 7 Jul 2009 12:35:24 -0300 Subject: [PATCH] test.test_utils_url: update parameter name; utils.url: minor code clean up --- scrapy/tests/test_utils_url.py | 2 +- scrapy/utils/url.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scrapy/tests/test_utils_url.py b/scrapy/tests/test_utils_url.py index ffd377444..cd4c87ff5 100644 --- a/scrapy/tests/test_utils_url.py +++ b/scrapy/tests/test_utils_url.py @@ -103,7 +103,7 @@ class UrlUtilsTest(unittest.TestCase): self.assertEqual(add_or_replace_parameter("http://domain/moreInfo.asp?prodID=", 'prodID', '20'), 'http://domain/moreInfo.asp?prodID=20') url = 'http://rmc-offers.co.uk/productlist.asp?BCat=2%2C60&CatID=60' - self.assertEqual(add_or_replace_parameter(url, 'BCat', 'newvalue', is_quoted=True), + self.assertEqual(add_or_replace_parameter(url, 'BCat', 'newvalue', url_is_quoted=True), 'http://rmc-offers.co.uk/productlist.asp?BCat=newvalue&CatID=60') url = 'http://rmc-offers.co.uk/productlist.asp?BCat=2,60&CatID=60' self.assertEqual(add_or_replace_parameter(url, 'BCat', 'newvalue'), diff --git a/scrapy/utils/url.py b/scrapy/utils/url.py index 938c1097f..e8265d8ec 100644 --- a/scrapy/utils/url.py +++ b/scrapy/utils/url.py @@ -85,8 +85,7 @@ def is_url(text): def url_query_parameter(url, parameter, default=None, keep_blank_values=0): """Return the value of a url parameter, given the url and parameter name""" queryparams = cgi.parse_qs(urlparse.urlsplit(str(url))[3], keep_blank_values=keep_blank_values) - result = queryparams.get(parameter, [default])[0] - return result + return queryparams.get(parameter, [default])[0] def url_query_cleaner(url, parameterlist=(), sep='&', kvsep='='): """Clean url arguments leaving only those passed in the parameterlist"""