diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-04-20 22:22:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-04-20 22:22:21 (GMT) |
| commit | d19458ac51633cac979b7c7b9439ea89f179c8c8 (patch) | |
| tree | 47b2dad429d3ab0eef0da3caa3d863dcc8815f25 | |
| parent | 4e2d82cfbceebf3237c956c56176bdc08f816283 (diff) | |
| parent | 6de708fd46207f6af67d4c0e8902f0d56ea4495c (diff) | |
| download | cpython-d19458ac51633cac979b7c7b9439ea89f179c8c8.zip cpython-d19458ac51633cac979b7c7b9439ea89f179c8c8.tar.gz cpython-d19458ac51633cac979b7c7b9439ea89f179c8c8.tar.bz2 | |
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 5e2d68c..7d160ce 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 5010fc3..349ba70 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: |