cpython: 65ce1d9eee30 (original) (raw)

Mercurial > cpython

changeset 95747:65ce1d9eee30

merge 3.4 (#23989) [#23989]

Benjamin Peterson benjamin@python.org
date	Mon, 20 Apr 2015 18:22:21 -0400
parents	ccac513ee610(current diff)c9239543235e(diff)
children	1764d42b340d
files	Doc/library/http.client.rst Doc/library/urllib.request.rst
diffstat	2 files changed, 10 insertions(+), 0 deletions(-)[+] [-] Doc/library/http.client.rst 5 Doc/library/urllib.request.rst 5

line wrap: on

line diff

--- a/Doc/library/http.client.rst +++ b/Doc/library/http.client.rst @@ -19,6 +19,11 @@ This module defines classes which implem HTTPS protocols. It is normally not used directly --- the module :mod:urllib.request uses it to handle URLs that use HTTP and HTTPS. +.. seealso:: +

The Requests package <http://requests.readthedocs.org/>_
is recommended for a higher-level http client interface.

+ .. note:: HTTPS support is only available if Python was compiled with SSL support

--- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -12,6 +12,11 @@ The :mod:urllib.request module defines opening URLs (mostly HTTP) in a complex world --- basic and digest authentication, redirections, cookies and more. +.. seealso:: +

The Requests package <http://requests.readthedocs.org/>_
is recommended for a higher-level http client interface.

+ The :mod:urllib.request module defines the following functions: