summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-05-26 01:55:28 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-05-26 01:55:28 (GMT)
commit4322c178b9923cb687bcb6beea5f46df755d0b61 (patch)
tree72c917d93000f3fc749a901594a90b1689157618
parent0b6f6c82b51b7071d88f48abb3192bf3dc2a2d24 (diff)
parentffa4b2c037b4e2b101b24927ae30ef2fd08c839e (diff)
downloadcpython-4322c178b9923cb687bcb6beea5f46df755d0b61.zip
cpython-4322c178b9923cb687bcb6beea5f46df755d0b61.tar.gz
cpython-4322c178b9923cb687bcb6beea5f46df755d0b61.tar.bz2
Issue #14920: Fix the help(urllib.parse) failure on locale C terminals. Just have ascii in help msg
-rw-r--r--Lib/urllib/parse.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 528c0a7..c0995dc 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")
diff --git a/Misc/NEWS b/Misc/NEWS
index 23ad604..ce2fe63 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -44,6 +44,9 @@ Core and Builtins
Library
-------
+- Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals.
+ Have ascii characters in help.
+
- Issue #14548: Make multiprocessing finalizers check pid before
running to cope with possibility of gc running just after fork.