[Python-checkins] r78458 - in python/branches/release26-maint: Doc/library/urllib.rst
senthil.kumaran
python-checkins at python.org
Fri Feb 26 01:49:45 CET 2010
Author: senthil.kumaran
Date: Fri Feb 26 01:49:45 2010
New Revision: 78458
Log:
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
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/library/urllib.rst
Modified: python/branches/release26-maint/Doc/library/urllib.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/urllib.rst (original)
+++ python/branches/release26-maint/Doc/library/urllib.rst Fri Feb 26 01:49:45 2010
@@ -265,6 +265,15 @@
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
------------------
More information about the Python-checkins
mailing list