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.rst b/Doc/library/urllib.rst
index 2e2fa433cd74dbc47101a5ff76f4c91708d3546e..b48973bbfd6debe89e14c68a10c021caefc5612c 100644 (file)
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -265,6 +265,15 @@ Utility functions
    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.
+
+
 URL Opener objects
 ------------------