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

Tue Apr 21 00:22:46 CEST 2015

https://hg.python.org/cpython/rev/65ce1d9eee30
changeset: 95747:65ce1d9eee30
parent: 95744:ccac513ee610
parent: 95745:c9239543235e
user: Benjamin Peterson <benjamin at python.org>
date: Mon Apr 20 18:22:21 2015 -0400
summary:
 merge 3.4 (#23989)
files:
 Doc/library/http.client.rst | 5 +++++
 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
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -19,6 +19,11 @@
 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
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -12,6 +12,11 @@
 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:
 
-- 
Repository URL: https://hg.python.org/cpython
