[Python-checkins] r78457 - python/trunk/Doc/library/urllib.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Fri Feb 26 01:47:05 2010
New Revision: 78457

Log:
Fixing issue5475 : urllib2.getproxies not documented



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

Modified: python/trunk/Doc/library/urllib.rst
==============================================================================
--- python/trunk/Doc/library/urllib.rst	(original)
+++ python/trunk/Doc/library/urllib.rst	Fri Feb 26 01:47:05 2010
@@ -265,6 +265,15 @@
    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
 ------------------