[Python-checkins] r75476 - in python/branches/py3k: Doc/library/urllib.request.rst

senthil.kumaran python-checkins at python.org
Sun Oct 18 03:42:33 CEST 2009

Author: senthil.kumaran
Date: Sun Oct 18 03:42:33 2009
New Revision: 75476

Merged revisions 75474 via svnmerge from 

  r75474 | senthil.kumaran | 2009-10-18 06:54:41 +0530 (Sun, 18 Oct 2009) | 2 lines
  Fix for Issue7155 - urllib do not document default use of system proxy configuration

   python/branches/py3k/   (props changed)

Modified: python/branches/py3k/Doc/library/urllib.request.rst
--- python/branches/py3k/Doc/library/urllib.request.rst	(original)
+++ python/branches/py3k/Doc/library/urllib.request.rst	Sun Oct 18 03:42:33 2009
@@ -49,6 +49,9 @@
    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 @@
    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.

More information about the Python-checkins mailing list