[Python-checkins] r75474 - in python/trunk/Doc/library: urllib.rst urllib2.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Sun Oct 18 03:24:41 2009
New Revision: 75474

Log:
Fix for Issue7155 - urllib do not document default use of system proxy configuration


Modified:
   python/trunk/Doc/library/urllib.rst
   python/trunk/Doc/library/urllib2.rst

Modified: python/trunk/Doc/library/urllib.rst
==============================================================================
--- python/trunk/Doc/library/urllib.rst	(original)
+++ python/trunk/Doc/library/urllib.rst	Sun Oct 18 03:24:41 2009
@@ -96,8 +96,10 @@
 
    .. index:: single: Internet Config
 
-   In a Macintosh environment, :func:`urlopen` will retrieve proxy information from
-   Internet Config.
+   In a Mac OS X  environment, :func:`urlopen` will retrieve proxy information
+   from the OS X System Configuration Framework, which can be managed with
+   Network System Preferences panel.
+
 
    Alternatively, the optional *proxies* argument may be used to explicitly specify
    proxies.  It must be a dictionary mapping scheme names to proxy URLs, where an

Modified: python/trunk/Doc/library/urllib2.rst
==============================================================================
--- python/trunk/Doc/library/urllib2.rst	(original)
+++ python/trunk/Doc/library/urllib2.rst	Sun Oct 18 03:24:41 2009
@@ -53,6 +53,9 @@
    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.
+
    .. versionchanged:: 2.6
       *timeout* was added.
 
@@ -187,8 +190,13 @@
 .. class:: ProxyHandler([proxies])
 
    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`.
+   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 from the OS X System Configuration Framework.
+
    To disable autodetected proxy pass an empty dictionary.