cpython (merge 3.4 -> default): merge 3.4
https://hg.python.org/cpython/rev/21b4356ffc06 changeset: 93365:21b4356ffc06 parent: 93362:7e89c24245ea parent: 93364:c51d85cf57f2 user: Benjamin Peterson <benjamin@python.org> date: Sun Nov 02 13:19:15 2014 -0500 summary: merge 3.4 files: 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 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -48,8 +48,8 @@ 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 @@ .. versionchanged:: 3.5 *context* was added. + .. function:: install_opener(opener) Install an :class:`OpenerDirector` instance as the default global opener. -- Repository URL: https://hg.python.org/cpython
participants (1)
-
benjamin.peterson