From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 28 Apr 2013 15:08:27 +0000 (-0400)
Subject: Merge #7152: Clarify that ProxyHandler is added only if proxy settings are detected.
X-Git-Tag: v3.4.0a1~838
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=876f08e3ae9de32447c5dfae580693f0aaa1f17a;p=thirdparty%2FPython%2Fcpython.git

Merge #7152: Clarify that ProxyHandler is added only if proxy settings are detected.

Behavior confirmation and initial patch by Jessica McKellar.
---

876f08e3ae9de32447c5dfae580693f0aaa1f17a
diff --cc Doc/library/urllib.request.rst
index ef80a924a716,0ccfda2c67fd..a027c5345934
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@@ -126,10 -128,11 +128,11 @@@ The :mod:`urllib.request` module define
     subclasses of :class:`BaseHandler` (in which case it must be possible to call
     the constructor without any parameters).  Instances of the following classes
     will be in front of the *handler*\s, unless the *handler*\s contain them,
-    instances of them or subclasses of them: :class:`ProxyHandler`,
+    instances of them or subclasses of them: :class:`ProxyHandler` (if proxy
+    settings are detected),
     :class:`UnknownHandler`, :class:`HTTPHandler`, :class:`HTTPDefaultErrorHandler`,
     :class:`HTTPRedirectHandler`, :class:`FTPHandler`, :class:`FileHandler`,
 -   :class:`HTTPErrorProcessor`.
 +   :class:`HTTPErrorProcessor`, :class:`DataHandler`.
  
     If the Python installation has SSL support (i.e., if the :mod:`ssl` module
     can be imported), :class:`HTTPSHandler` will also be added.