[Python-checkins] r78460 - in python/branches/release31-maint: Doc/library/urllib.request.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Fri Feb 26 01:55:09 2010
New Revision: 78460

Log:
Merged revisions 78459 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78459 | senthil.kumaran | 2010-02-26 06:23:23 +0530 (Fri, 26 Feb 2010) | 9 lines
  
  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
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/urllib.request.rst

Modified: python/branches/release31-maint/Doc/library/urllib.request.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.request.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.request.rst	Fri Feb 26 01:55:09 2010
@@ -164,6 +164,14 @@
    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: