[Python-checkins] cpython: Issue #25576: Apply fix to new urlopen() doc string

Tue Nov 24 18:07:21 EST 2015

https://hg.python.org/cpython/rev/671429cc1d96
changeset: 99333:671429cc1d96
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Nov 24 23:00:37 2015 +0000
summary:
 Issue #25576: Apply fix to new urlopen() doc string
files:
 Lib/urllib/request.py | 9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -149,13 +149,8 @@
 
 *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.
-- 
Repository URL: https://hg.python.org/cpython
