mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge 3.4

Browse source
This commit is contained in:
Benjamin Peterson 2014-11-02 13:19:15 -05:00
commit 030dbb91a9
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/library/urllib.request.rst
View file

@ -48,8 +48,8 @@ The :mod:`urllib.request` module defines the following functions:
only works for HTTP, HTTPS and FTP connections.
If *context* is specified, it must be a :class:`ssl.SSLContext` instance
describing the various SSL options. See
:class:`~http.client.HTTPSConnection` for more details.
describing the various SSL options. See :class:`~http.client.HTTPSConnection`
for more details.
The optional *cafile* and *capath* parameters specify a set of trusted
CA certificates for HTTPS requests. *cafile* should point to a single
@ -118,6 +118,7 @@ The :mod:`urllib.request` module defines the following functions:
.. versionchanged:: 3.5
*context* was added.
.. function:: install_opener(opener)
Install an :class:`OpenerDirector` instance as the default global opener.