merge 3.4

This commit is contained in:
Benjamin Peterson 2014-11-23 11:43:43 -06:00
commit f1a3240ba8

View file

@ -57,10 +57,7 @@ The :mod:`urllib.request` module defines the following functions:
point to a directory of hashed certificate files. More information can point to a directory of hashed certificate files. More information can
be found in :meth:`ssl.SSLContext.load_verify_locations`. be found in :meth:`ssl.SSLContext.load_verify_locations`.
The *cadefault* parameter specifies whether to fall back to loading a The *cadefault* parameter is ignored.
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.
For http and https urls, this function returns a For http and https urls, this function returns a
:class:`http.client.HTTPResponse` object which has the following :class:`http.client.HTTPResponse` object which has the following