From: Senthil Kumaran <orsenthil@gmail.com>
Date: Fri, 26 Feb 2010 00:47:05 +0000 (+0000)
Subject: Fixing issue5475 : urllib2.getproxies not documented
X-Git-Tag: v2.7a4~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c994186dad39eee832112318d63f96189d8f2b57;p=thirdparty%2FPython%2Fcpython.git

Fixing issue5475 : urllib2.getproxies not documented
---

diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 2e2fa433cd74..b48973bbfd6d 100644
--- 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
 ------------------