RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified url_safe_string in order to accept strings encoded in any encoding apart from unicode objects 

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40608
This commit is contained in:
elpolilla 2009-01-02 18:31:55 +00:00
parent 95495f1d9d
commit c791155aac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scrapy/trunk/scrapy/utils/url.py
View File

@ -43,18 +43,18 @@ _unreserved_marks = "-_.!~*'()" #RFC 2396 sec 2.3
_safe_chars = urllib.always_safe + '%' + _reserved + _unreserved_marks
def safe_url_string(url, use_encoding='utf8'):
"""Convert a unicode (or utf8 string) object into a legal URL.
"""Convert a unicode object (using 'use_encoding' as the encoding), or an already
encoded string into a legal URL.
Illegal characters are escaped (RFC-3986)
It is safe to call this function multiple times. Do not pass this
function strings in encodings other than utf8.
It is safe to call this function multiple times.
The use_encoding argument is the encoding to use to determine the numerical
values in the escaping. For urls on html pages, you should use the original
encoding of that page.
"""
s = url.encode(use_encoding)
s = url.encode(use_encoding) if isinstance(url, unicode) else url
return urllib.quote(s, _safe_chars)