summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-04 05:06:34 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-04 05:06:34 (GMT)
commit29f256909feba58350c023671b639eb1f684d5b9 (patch)
treecf8d6ecbf88896f9cd9a6d5c578835222bd60111 /Lib/urllib
parent0f29ad1be56b98dbbd661128299136e40407333d (diff)
downloadcpython-29f256909feba58350c023671b639eb1f684d5b9.zip
cpython-29f256909feba58350c023671b639eb1f684d5b9.tar.gz
cpython-29f256909feba58350c023671b639eb1f684d5b9.tar.bz2
Issue #22797: Synchronize urlopen() doc string with RST documentation
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/request.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index b16b642..67e73f9 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -172,8 +172,8 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
The *cadefault* parameter is ignored.
- For http and https urls, this function returns a http.client.HTTPResponse
- object which has the following HTTPResponse Objects methods:
+ This function always returns an object which can work as a context
+ manager and has methods such as
* geturl() - return the URL of the resource retrieved, commonly used to
determine if a redirect was followed
@@ -185,12 +185,17 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
* getcode() - return the HTTP status code of the response. Raises URLError
on errors.
- For ftp, file, and data urls and requests explicitly handled by legacy
+ For HTTP and HTTPS URLs, this function returns a http.client.HTTPResponse
+ object slightly modified. In addition to the three new methods above, the
+ msg attribute contains the same information as the reason attribute ---
+ the reason phrase returned by the server --- instead of the response
+ headers as it is specified in the documentation for HTTPResponse.
+
+ For FTP, file, and data URLs and requests explicitly handled by legacy
URLopener and FancyURLopener classes, this function returns a
- urllib.response.addinfourl object which can work as a context manager and
- also support the geturl(), info(), getcode() methods listed above.
+ urllib.response.addinfourl object.
- Note that *None& may be returned if no handler handles the request (though
+ Note that None may be returned if no handler handles the request (though
the default installed global OpenerDirector uses UnknownHandler to ensure
this never happens).