| --- a/Doc/library/urllib.request.rst Fri May 11 13:11:02 2012 -0400 |
| +++ b/Doc/library/urllib.request.rst Wed May 16 12:11:57 2012 -0700 |
| @@ -16,7 +16,7 @@ |
| The :mod:`urllib.request` module defines the following functions: |
| -.. function:: urlopen(url, data=None[, timeout], *, cafile=None, capath=None) |
| +.. function:: urlopen(url, data=None[, timeout], *, cafile=None, capath=None, cadefault=True) |
| Open the URL *url*, which can be either a string or a |
| :class:`Request` object. |
| @@ -53,9 +53,14 @@ |
| point to a directory of hashed certificate files. More information can |
| be found in :meth:`ssl.SSLContext.load_verify_locations`. |
| + The *cadefault* parameter specifies whether to fall back to loading a |
| + default certificate store defined by the underlying OpenSSL library if the |
| + *cafile* and *capath* parameters are omitted. |
| + |
| .. warning:: |
| - If neither *cafile* nor *capath* is specified, an HTTPS request |
| - will not do any verification of the server's certificate. |
| + If neither *cafile* nor *capath* is specified, and *cadefault* is False, |
| + an HTTPS request will not do any verification of the server's |
| + certificate. |
| This function returns a file-like object that works as a :term:`context manager`, |
| with two additional methods from the :mod:`urllib.response` module |