[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #22989, #21228: Merge urlopen() doc from 3.4 into 3.5
martin.panter
python-checkins at python.org
Thu Nov 26 06:07:12 EST 2015
https://hg.python.org/cpython/rev/b55c006b79bc
changeset: 99371:b55c006b79bc
branch: 3.5
parent: 99368:38f749f0a1bd
parent: 99370:fa3c9faabfb0
user: Martin Panter <vadmium+py at gmail.com>
date: Thu Nov 26 11:03:50 2015 +0000
summary:
Issue #22989, #21228: Merge urlopen() doc from 3.4 into 3.5
files:
Doc/library/urllib.request.rst | 20 +++++++++++++-------
Misc/ACKS | 1 +
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -59,13 +59,7 @@
The *cadefault* parameter is ignored.
- For http and https urls, this function returns a
- :class:`http.client.HTTPResponse` object which has the following
- :ref:`httpresponse-objects` methods.
-
- For ftp, file, and data urls and requests explicitly handled by legacy
- :class:`URLopener` and :class:`FancyURLopener` classes, this function
- returns a :class:`urllib.response.addinfourl` object which can work as
+ This function always returns an object which can work as
:term:`context manager` and has methods such as
* :meth:`~urllib.response.addinfourl.geturl` --- return the URL of the resource retrieved,
@@ -77,6 +71,18 @@
* :meth:`~urllib.response.addinfourl.getcode` -- return the HTTP status code of the response.
+ For http and https urls, this function returns a
+ :class:`http.client.HTTPResponse` object slightly modified. In addition
+ to the three new methods above, the msg attribute contains the
+ same information as the :attr:`~http.client.HTTPResponse.reason`
+ attribute --- the reason phrase returned by server --- instead of
+ the response headers as it is specified in the documentation for
+ :class:`~http.client.HTTPResponse`.
+
+ For ftp, file, and data urls and requests explicitly handled by legacy
+ :class:`URLopener` and :class:`FancyURLopener` classes, this function
+ returns a :class:`urllib.response.addinfourl` object.
+
Raises :exc:`~urllib.error.URLError` on errors.
Note that ``None`` may be returned if no handler handles the request (though
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -443,6 +443,7 @@
Michael Foord
Amaury Forgeot d'Arc
Doug Fort
+Evens Fortuné
Chris Foster
John Fouhy
Andrew Francis
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list