[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/ebfb966c8979
changeset:   93552:ebfb966c8979
parent:      93548:dfe7d9fee0b5
parent:      93551:3cc8b7227db4
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Nov 23 11:43:43 2014 -0600
summary:
  merge 3.4

files:
  Doc/library/urllib.request.rst |  5 +----
  1 files changed, 1 insertions(+), 4 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
@@ -57,10 +57,7 @@
    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.  This will only work on
-   some non-Windows platforms.
+   The *cadefault* parameter is ignored.
 
    For http and https urls, this function returns a
    :class:`http.client.HTTPResponse` object which has the following

-- 
Repository URL: https://hg.python.org/cpython