diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-04-20 18:22:21 -0400 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-04-20 18:22:21 -0400 |
commit | 07592a76aff58c111338a4a5c2dee5347c7b3e9f (patch) | |
tree | 8d5f10985afd1a074ef6b281636a1a493abb557f | |
parent | e7976e9e10a88800b25d8dbbfc747a1c73565a82 (diff) | |
parent | 70e3e0e3c77084d31ecc7aa7b6fdd05c8b26a642 (diff) | |
download | cpython-07592a76aff58c111338a4a5c2dee5347c7b3e9f.tar.gz |
merge 3.4 (#23989)
-rw-r--r-- | Doc/library/http.client.rst | 5 | ||||
-rw-r--r-- | Doc/library/urllib.request.rst | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst index 5e2d68ce09..7d160ce81a 100644 --- a/Doc/library/http.client.rst +++ b/Doc/library/http.client.rst @@ -19,6 +19,11 @@ This module defines classes which implement the client side of the HTTP and 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 diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 5010fc34e6..349ba70d36 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -12,6 +12,11 @@ The :mod:`urllib.request` module defines functions and classes which help in 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: |