From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 18 Oct 2009 01:57:26 +0000 (+0000)
Subject: Manually merging the changes from r75476
X-Git-Tag: v3.1.2rc1~445
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6eb181a668793bc44e2d147d3e4d5daf2b3a3f6c;p=thirdparty%2FPython%2Fcpython.git

Manually merging the changes from r75476
---

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index b05641c7ae89..9d606626f79a 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -49,6 +49,9 @@ The :mod:`urllib.request` module defines the following functions:
    the default installed global :class:`OpenerDirector` uses
    :class:`UnknownHandler` to ensure this never happens).
 
+   In addition, default installed :class:`ProxyHandler` makes sure the requests
+   are handled through the proxy when they are set.
+
    The legacy ``urllib.urlopen`` function from Python 2.6 and earlier has been
    discontinued; :func:`urlopen` corresponds to the old ``urllib2.urlopen``.
    Proxy handling, which was done by passing a dictionary parameter to
@@ -350,6 +353,11 @@ The following classes are provided:
    Cause requests to go through a proxy. If *proxies* is given, it must be a
    dictionary mapping protocol names to URLs of proxies. The default is to read the
    list of proxies from the environment variables :envvar:`<protocol>_proxy`.
+   If no proxy environment variables are set, in a Windows environment, proxy
+   settings are obtained from the registry's Internet Settings section and in a
+   Mac OS X environment, proxy information is retrieved from the OS X System
+   Configuration Framework.
+
    To disable autodetected proxy pass an empty dictionary.