changed remove_fragments argument to keep_fragments, for consistency with the other canonicalize_url arguments

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40188

scrapy/trunk/scrapy/tests/test_utils_url.py

@@ -138,7 +138,7 @@ class UrlUtilsTest(unittest.TestCase):
         # remove fragments
         self.assertEqual(canonicalize_url(u"http://user:pass@www.example.com/do?a=1#frag"),
                                           u"http://user:pass@www.example.com/do?a=1")
-        self.assertEqual(canonicalize_url(u"http://user:pass@www.example.com/do?a=1#frag", remove_fragments=False),
+        self.assertEqual(canonicalize_url(u"http://user:pass@www.example.com/do?a=1#frag", keep_fragments=True),
                                           u"http://user:pass@www.example.com/do?a=1#frag")
 
 if __name__ == "__main__":

scrapy/trunk/scrapy/utils/url.py

@@ -125,7 +125,7 @@ def add_or_replace_parameter(url, name, new_value, sep='&'):
                                name+'='+new_value)
     return next_url
 
-def canonicalize_url(url, keep_blank_values=False, remove_fragments=True):
+def canonicalize_url(url, keep_blank_values=False, keep_fragments=False):
     """Canonicalize url by applying the following procedures:
 
     - sort query arguments, first by key, then by value
@@ -134,7 +134,7 @@ def canonicalize_url(url, keep_blank_values=False, remove_fragments=True):
     - normalize all spaces (in query arguments) '+' (plus symbol)
     - normalize percent encodings case (%2f -> %2F)
     - remove query arguments with blank values (unless keep_blank_values is True)
-    - remove fragments (if remove_fragments is True)
+    - remove fragments (unless keep_fragments is True)
 
     For examples see the tests in scrapy.tests.test_utils_url
     """
@@ -144,6 +144,6 @@ def canonicalize_url(url, keep_blank_values=False, remove_fragments=True):
     keyvals.sort()
     parts[2] = urllib.quote(urllib.unquote(parts[2]))
     parts[4] = urllib.urlencode(keyvals)
-    if remove_fragments:
+    if not keep_fragments:
         parts[5] = ''
     return urlparse.urlunparse(parts)