From: Senthil Kumaran <senthil@uthcode.com>
Date: Sat, 26 May 2012 01:53:32 +0000 (+0800)
Subject: Issue #14920: Fix the help(urllib.parse) failure on locale C terminals. Just have... 
X-Git-Tag: v3.3.0a4~55^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffa4b2c037b4e2b101b24927ae30ef2fd08c839e;p=thirdparty%2FPython%2Fcpython.git

Issue #14920: Fix the help(urllib.parse) failure on locale C terminals. Just have ascii in help msg
---

diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 528c0a7aafb1..c0995dc010eb 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 efec480d6dc3..10b8ab175c1d 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.