summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-24 23:00:37 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-24 23:00:37 (GMT)
commitf65dd1d4db088ab2a12430f1b6d43e8f1ed04e18 (patch)
treefd6f165b48d539c72617d0412a8c75a87c775d77
parenta561c038ab336597652c9074818293ddfc65a25d (diff)
downloadcpython-f65dd1d4db088ab2a12430f1b6d43e8f1ed04e18.zip
cpython-f65dd1d4db088ab2a12430f1b6d43e8f1ed04e18.tar.gz
cpython-f65dd1d4db088ab2a12430f1b6d43e8f1ed04e18.tar.bz2
Issue #25576: Apply fix to new urlopen() doc string
-rw-r--r--Lib/urllib/request.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index e6abf34..57d0dea 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -149,13 +149,8 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
*data* should be a buffer in the standard application/x-www-form-urlencoded
format. The urllib.parse.urlencode() function takes a mapping or sequence
- of 2-tuples and returns a string in this format. It should be encoded to
- bytes before being used as the data parameter. The charset parameter in
- Content-Type header may be used to specify the encoding. If charset
- parameter is not sent with the Content-Type header, the server following
- the HTTP 1.1 recommendation may assume that the data is encoded in
- ISO-8859-1 encoding. It is advisable to use charset parameter with encoding
- used in Content-Type header with the Request.
+ of 2-tuples and returns an ASCII text string in this format. It should be
+ encoded to bytes before being used as the data parameter.
urllib.request module uses HTTP/1.1 and includes a "Connection:close"
header in its HTTP requests.