[Python-checkins] r75475 - in python/branches/release26-maint: Doc/library/urllib.rst Doc/library/urllib2.rst
senthil.kumaran
python-checkins at python.org
Sun Oct 18 03:31:15 CEST 2009
Author: senthil.kumaran
Date: Sun Oct 18 03:31:15 2009
New Revision: 75475
Log:
Merged revisions 75474 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75474 | senthil.kumaran | 2009-10-18 06:54:41 +0530 (Sun, 18 Oct 2009) | 2 lines
Fix for Issue7155 - urllib do not document default use of system proxy configuration
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/library/urllib.rst
python/branches/release26-maint/Doc/library/urllib2.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 Sun Oct 18 03:31:15 2009
@@ -96,8 +96,10 @@
.. index:: single: Internet Config
- In a Macintosh environment, :func:`urlopen` will retrieve proxy information from
- Internet Config.
+ In a Mac OS X environment, :func:`urlopen` will retrieve proxy information
+ from the OS X System Configuration Framework, which can be managed with
+ Network System Preferences panel.
+
Alternatively, the optional *proxies* argument may be used to explicitly specify
proxies. It must be a dictionary mapping scheme names to proxy URLs, where an
Modified: python/branches/release26-maint/Doc/library/urllib2.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/urllib2.rst (original)
+++ python/branches/release26-maint/Doc/library/urllib2.rst Sun Oct 18 03:31:15 2009
@@ -53,6 +53,9 @@
default installed global :class:`OpenerDirector` uses :class:`UnknownHandler` to
ensure this never happens).
+ In addition, default installed :class:`ProxyHandler` makes sure the requests
+ are handled through the proxy when they are set.
+
.. versionchanged:: 2.6
*timeout* was added.
@@ -187,8 +190,13 @@
.. class:: ProxyHandler([proxies])
Cause requests to go through a proxy. If *proxies* is given, it must be a
- dictionary mapping protocol names to URLs of proxies. The default is to read the
- list of proxies from the environment variables :envvar:`<protocol>_proxy`.
+ dictionary mapping protocol names to URLs of proxies. The default is to read
+ the list of proxies from the environment variables
+ :envvar:`<protocol>_proxy`. If no proxy environment variables are set, in a
+ Windows environment, proxy settings are obtained from the registry's
+ Internet Settings section and in a Mac OS X environment, proxy information
+ is retrieved from from the OS X System Configuration Framework.
+
To disable autodetected proxy pass an empty dictionary.
More information about the Python-checkins
mailing list