diff options
| author |   Senthil Kumaran <orsenthil@gmail.com> | 2010-02-26 00:55:09 +0000 |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-02-26 00:55:09 +0000 |
| commit | c2eca3d73a6611aa1e3d607427d1e1da6e3794af (patch) | |
| tree | 2ad87c0ad1650e21634dfe0ebf3a8ad34e7f2549 | |
| parent | Merged revisions 78446 via svnmerge from (diff) | |
| download | cpython-c2eca3d73a6611aa1e3d607427d1e1da6e3794af.tar.gz cpython-c2eca3d73a6611aa1e3d607427d1e1da6e3794af.tar.bz2 cpython-c2eca3d73a6611aa1e3d607427d1e1da6e3794af.zip | |
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
........
................
| -rw-r--r-- | Doc/library/urllib.request.rst | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index b43d9a9c9d2..f1fe42ab442 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -164,6 +164,14 @@ The :mod:`urllib.request` module defines the following functions: 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: |