diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-23 17:43:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-23 17:43:43 (GMT) |
| commit | f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c (patch) | |
| tree | f431cb97afb423edef27e4c357205d9fdacc938d /Doc/library/urllib.request.rst | |
| parent | d3c53b6048b156d358bc0729b6e0ede3fc4a5516 (diff) | |
| parent | 378e15d7abedb4a1990230d5e3c74d2390be96c4 (diff) | |
| download | cpython-f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c.zip cpython-f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c.tar.gz cpython-f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Doc/library/urllib.request.rst')
| -rw-r--r-- | Doc/library/urllib.request.rst | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index dca56d6..2400526 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -57,10 +57,7 @@ The :mod:`urllib.request` module defines the following functions: point to a directory of hashed certificate files. More information can be found in :meth:`ssl.SSLContext.load_verify_locations`. - The *cadefault* parameter specifies whether to fall back to loading a - default certificate store defined by the underlying OpenSSL library if the - *cafile* and *capath* parameters are omitted. This will only work on - some non-Windows platforms. + The *cadefault* parameter is ignored. For http and https urls, this function returns a :class:`http.client.HTTPResponse` object which has the following |