diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-02-26 00:49:45 +0000 |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-02-26 00:49:45 +0000 |
| commit | 5b2c005135298d83a3bfbadca02d8974f4cf472f (patch) | |
| tree | c5edf617caabac81d9311a863ba22f659ac6c570 | |
| parent | 85ddea7e69aa6892858df1a93d468608cedb93df (diff) | |
| download | cpython-git-5b2c005135298d83a3bfbadca02d8974f4cf472f.tar.gz | |
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
........
| -rw-r--r-- | Doc/library/urllib.rst | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst index 2e2fa433cd..b48973bbfd 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 ------------------ |