diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-05-26 03:48:27 +0100 |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2012-05-26 03:48:27 +0100 |
commit | b5267631cb2a62088ef12b36abd0317957244c6c (patch) | |
tree | e3c9036009a40a9b94601dc443217c50759cd987 /Lib/urllib/parse.py | |
parent | 7ded1f0f694f0f99252ea19eca18b74ea5e36cb0 (diff) | |
parent | 94a64260937a59c53b2a5668b09f9f2d2b5261c6 (diff) | |
download | cpython-git-b5267631cb2a62088ef12b36abd0317957244c6c.tar.gz |
Merged upstream changes.
Diffstat (limited to 'Lib/urllib/parse.py')
-rw-r--r-- | Lib/urllib/parse.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 528c0a7aaf..c0995dc010 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -707,7 +707,7 @@ def quote_plus(string, safe='', encoding=None, errors=None): def quote_from_bytes(bs, safe='/'): """Like quote(), but accepts a bytes object rather than a str, and does not perform string-to-bytes encoding. It always returns an ASCII string. - quote_from_bytes(b'abc def\xab') -> 'abc%20def%AB' + quote_from_bytes(b'abc def\x3f') -> 'abc%20def%3f' """ if not isinstance(bs, (bytes, bytearray)): raise TypeError("quote_from_bytes() expected bytes") |