diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-02 18:19:15 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-02 18:19:15 (GMT) |
| commit | 030dbb91a92096c0a7611f2e0c711035622b5669 (patch) | |
| tree | 1acb245937d82e0497f6726c996bd8ddc5234b88 | |
| parent | a14414dfe91d964f75749e30c8c6eeb34696bdc9 (diff) | |
| parent | a5c9c37dd51cdec4e858fde6a42bf6b2868cae48 (diff) | |
| download | cpython-030dbb91a92096c0a7611f2e0c711035622b5669.zip cpython-030dbb91a92096c0a7611f2e0c711035622b5669.tar.gz cpython-030dbb91a92096c0a7611f2e0c711035622b5669.tar.bz2 | |
merge 3.4
| -rw-r--r-- | Doc/library/urllib.request.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 07928ed..9de8dd3 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -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. |