From c2eca3d73a6611aa1e3d607427d1e1da6e3794af Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Fri, 26 Feb 2010 00:55:09 +0000 Subject: [PATCH] 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 ........ ................ --- Doc/library/urllib.request.rst | 8 ++++++++ 1 file changed, 8 insertions(+) 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 ``_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: