summaryrefslogtreecommitdiffstats
path: root/Lib/urllib/parse.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-12-25 02:23:18 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-12-25 02:23:18 (GMT)
commit8c4e112afcf6b2236c43273d007de5b61d4b6519 (patch)
treebba468ba3f6bf9b9c7ff1c6093ee0ca838cc9ded /Lib/urllib/parse.py
parenta54f07504f2b555e97eed2213acd749dd53194b5 (diff)
downloadcpython-8c4e112afcf6b2236c43273d007de5b61d4b6519.zip
cpython-8c4e112afcf6b2236c43273d007de5b61d4b6519.tar.gz
cpython-8c4e112afcf6b2236c43273d007de5b61d4b6519.tar.bz2
#23040: Clarify treatment of encoding and errors when component is bytes.
Patch by Wojtek Ruszczewski.
Diffstat (limited to 'Lib/urllib/parse.py')
-rw-r--r--Lib/urllib/parse.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index a2a912d..d368331 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -670,8 +670,8 @@ def quote(string, safe='/', encoding=None, errors=None):
called on a path where the existing slash characters are used as
reserved characters.
- string and safe may be either str or bytes objects. encoding must
- not be specified if string is a str.
+ string and safe may be either str or bytes objects. encoding and errors
+ must not be specified if string is a bytes object.
The optional encoding and errors parameters specify how to deal with
non-ASCII characters, as accepted by the str.encode method.
@@ -743,8 +743,9 @@ def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
input.
The components of a query arg may each be either a string or a bytes type.
- When a component is a string, the safe, encoding and error parameters are
- sent to the quote_plus function for encoding.
+
+ The safe, encoding, and errors parameters are passed down to quote_plus()
+ (encoding and errors only if a component is a str).
"""
if hasattr(query, "items"):