summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-05-26 01:53:32 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-05-26 01:53:32 (GMT)
commitffa4b2c037b4e2b101b24927ae30ef2fd08c839e (patch)
tree2562aab0989833b8580d72f2badb25f9b8da344d
parent54454e7dc25f8ce5aef87a4faed89aca19067815 (diff)
downloadcpython-ffa4b2c037b4e2b101b24927ae30ef2fd08c839e.zip
cpython-ffa4b2c037b4e2b101b24927ae30ef2fd08c839e.tar.gz
cpython-ffa4b2c037b4e2b101b24927ae30ef2fd08c839e.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 efec480..10b8ab1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -67,6 +67,9 @@ Core and Builtins
Library
-------
+- Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals.
+ Have ascii characters in help.
+
- Issue #14863: Update the documentation of os.fdopen() to reflect the
fact that it's only a thin wrapper around open() anymore.