summaryrefslogtreecommitdiffstats
path: root/Doc/library/urllib.rst
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-02-26 00:47:05 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-02-26 00:47:05 (GMT)
commitc994186dad39eee832112318d63f96189d8f2b57 (patch)
treeb83d1633f4d4ed65c07648af5259b21e01483754 /Doc/library/urllib.rst
parent99bf01b4b4daf5c597bd1c7b58251e68adcf1301 (diff)
downloadcpython-c994186dad39eee832112318d63f96189d8f2b57.zip
cpython-c994186dad39eee832112318d63f96189d8f2b57.tar.gz
cpython-c994186dad39eee832112318d63f96189d8f2b57.tar.bz2
Fixing issue5475 : urllib2.getproxies not documented
Diffstat (limited to 'Doc/library/urllib.rst')
-rw-r--r--Doc/library/urllib.rst9
1 files changed, 9 insertions, 0 deletions
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 2e2fa43..b48973b 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
------------------