Commit 030dbb91 authored by Benjamin Peterson's avatar Benjamin Peterson

merge 3.4

parents a14414df a5c9c37d
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment