summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-11-26 11:01:58 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-11-26 11:01:58 (GMT)
commit747d48cf27e1843f7d1046b4e8127833a40cf9b3 (patch)
tree741221e14f338939d103df173239634007faead6 /Doc/library
parent92072ac8b4cbd8c0bf8d7e7da143887fb9d53a03 (diff)
downloadcpython-747d48cf27e1843f7d1046b4e8127833a40cf9b3.zip
cpython-747d48cf27e1843f7d1046b4e8127833a40cf9b3.tar.gz
cpython-747d48cf27e1843f7d1046b4e8127833a40cf9b3.tar.bz2
Issues #22989, #21228: Document HTTP response object for urlopen()
Previous documentation was not clear if the geturl(), info() and getcode() were valid for HTTP responses. The “msg” attribute is different to the usual HTTPResponse.msg attribute. Based on patch by Evens Fortuné.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/urllib.request.rst20
1 files changed, 13 insertions, 7 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index d98f200..4e595de 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -59,13 +59,7 @@ The :mod:`urllib.request` module defines the following functions:
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 @@ The :mod:`urllib.request` module defines the following functions:
* :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