mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-19 16:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Reverting the checkin made in revision 82940, as it was adding new parameters to quote function in a bugfix release.

Browse source 
Discussed in issue1712522
This commit is contained in:
Senthil Kumaran 2010-07-22 01:47:30 +00:00
parent 7a7013e830
commit 880685f698
4 changed files with 7 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/urllib.py
View file

@ -1193,7 +1193,7 @@ for i, c in zip(xrange(256), str(bytearray(xrange(256)))):
_safe_map[c] = c if (i < 128 and c in always_safe) else '%{:02X}'.format(i)
_safe_quoters = {}
def quote(s, safe='/', encoding=None, errors=None):
def quote(s, safe='/'):
"""quote('abc def') -> 'abc%20def'
Each part of a URL, e.g. the path info, the query, etc., has a
@ -1213,30 +1213,12 @@ def quote(s, safe='/', encoding=None, errors=None):
is reserved, but in typical usage the quote function is being
called on a path where the existing slash characters are used as
reserved characters.
string and safe may be either str or unicode objects.
The optional encoding and errors parameters specify how to deal with the
non-ASCII characters, as accepted by the unicode.encode method.
By default, encoding='utf-8' (characters are encoded with UTF-8), and
errors='strict' (unsupported characters raise a UnicodeEncodeError).
"""
# fastpath
if not s:
if s is None:
raise TypeError('None object cannot be quoted')
return s
if encoding is not None or isinstance(s, unicode):
if encoding is None:
encoding = 'utf-8'
if errors is None:
errors = 'strict'
s = s.encode(encoding, errors)
if isinstance(safe, unicode):
# Normalize 'safe' by converting to str and removing non-ASCII chars
safe = safe.encode('ascii', 'ignore')
cachekey = (safe, always_safe)
try:
(quoter, safe) = _safe_quoters[cachekey]
@ -1250,12 +1232,12 @@ def quote(s, safe='/', encoding=None, errors=None):
return s
return ''.join(map(quoter, s))
def quote_plus(s, safe='', encoding=None, errors=None):
def quote_plus(s, safe=''):
"""Quote the query fragment of a URL; replacing ' ' with '+'"""
if ' ' in s:
s = quote(s, safe + ' ', encoding, errors)
s = quote(s, safe + ' ')
return s.replace(' ', '+')
return quote(s, safe, encoding, errors)
return quote(s, safe)
def urlencode(query, doseq=0):
"""Encode a sequence of two-element tuples or dictionary into a URL query string.