Merged revisions 78457 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78457 | senthil.kumaran | 2010-02-26 06:17:05 +0530 (Fri, 26 Feb 2010) | 3 lines

  Fixing issue5475 : urllib2.getproxies not documented
........

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index b43d9a9c9d2b85ee3701b4a0fe69ff7b6de7801b..f1fe42ab442ff240b9e97c5c2f26c6902ea6c82b 100644 (file)
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -164,6 +164,14 @@ The :mod:`urllib.request` module defines the following functions:
    path.  This does not accept a complete URL.  This function uses :func:`unquote`
    to decode *path*.
 
+.. function:: getproxies()
+
+   This helper function returns a dictionary of scheme to proxy server URL
+   mappings. It scans the environment for variables named ``<scheme>_proxy``
+   for all operating systems first, and when it cannot find it, looks for proxy
+   information from Mac OSX System Configuration for Mac OS X and Windows
+   Systems Registry for Windows.
+
 
 The following classes are provided: