diff options
author | Senthil Kumaran <orsenthil@gmail.com> | 2010-02-26 00:53:23 (GMT) |
---|---|---|
committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-02-26 00:53:23 (GMT) |
commit | 7e557a6e1f998e1bb5a03fe2d3087f8a78f6e208 (patch) | |
tree | 9cdef48b9812c250f0203a1527841d29f1414b76 /Doc | |
parent | db81c4c63a702be1ec6e298bbee70634df873e68 (diff) | |
download | cpython-7e557a6e1f998e1bb5a03fe2d3087f8a78f6e208.zip cpython-7e557a6e1f998e1bb5a03fe2d3087f8a78f6e208.tar.gz cpython-7e557a6e1f998e1bb5a03fe2d3087f8a78f6e208.tar.bz2 |
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
........
Diffstat (limited to 'Doc')
-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 b43d9a9..f1fe42a 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: |