From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 20 Apr 2015 22:20:27 +0000 (-0400)
Subject: recommend requests library (closes #23989)
X-Git-Tag: v2.7.10rc1~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c6ca8adb3739abc10e390ff497427758b6ed8c5;p=thirdparty%2FPython%2Fcpython.git

recommend requests library (closes #23989)

Patch by Van Lindberg.
---

diff --git a/Doc/library/httplib.rst b/Doc/library/httplib.rst
index a4bff4f230a5..03f4fb299d5e 100644
--- a/Doc/library/httplib.rst
+++ b/Doc/library/httplib.rst
@@ -24,6 +24,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`
 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 the :mod:`socket` module was compiled with
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index b2a817db469f..d0cc54865165 100644
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -24,6 +24,11 @@ built-in function :func:`open`, but accepts Universal Resource Locators (URLs)
 instead of filenames.  Some restrictions apply --- it can only open URLs for
 reading, and no seek operations are available.
 
+.. seealso::
+
+    The `Requests package <http://requests.readthedocs.org/>`_
+    is recommended for a higher-level http client interface.
+
 .. warning:: When opening HTTPS URLs, it does not attempt to validate the
    server certificate.  Use at your own risk!
 
diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
index f599894adcbc..3fe4f25015a6 100644
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -18,6 +18,11 @@ The :mod:`urllib2` 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:`urllib2` module defines the following functions: