Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge: Reflow paragraphs. 

(I got a merge conflict on this in urllib.request.rst, which makes no sense to
me.  Hopefully I didn't screw up the previous 3.3 commit.)
This commit is contained in:
R David Murray 2013-04-28 11:30:19 -04:00
parent 876f08e3ae 9330a94467
commit d4c1b36c39
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doc/howto/urllib2.rst
View File

@ -523,10 +523,10 @@ Proxies
**urllib** will auto-detect your proxy settings and use those. This is through
the ``ProxyHandler``, which is part of the normal handler chain when a proxy
setting is detected. Normally that's
a good thing, but there are occasions when it may not be helpful [#]_. One way
to do this is to setup our own ``ProxyHandler``, with no proxies defined. This
is done using similar steps to setting up a `Basic Authentication`_ handler : ::
setting is detected. Normally that's a good thing, but there are occasions
when it may not be helpful [#]_. One way to do this is to setup our own
``ProxyHandler``, with no proxies defined. This is done using similar steps to
setting up a `Basic Authentication`_ handler : ::
>>> proxy_support = urllib.request.ProxyHandler({})
>>> opener = urllib.request.build_opener(proxy_support)

19
Doc/library/urllib.request.rst
View File

@ -129,10 +129,9 @@ The :mod:`urllib.request` module defines the following functions:
the constructor without any parameters). Instances of the following classes
will be in front of the *handler*\s, unless the *handler*\s contain them,
instances of them or subclasses of them: :class:`ProxyHandler` (if proxy
settings are detected),
:class:`UnknownHandler`, :class:`HTTPHandler`, :class:`HTTPDefaultErrorHandler`,
:class:`HTTPRedirectHandler`, :class:`FTPHandler`, :class:`FileHandler`,
:class:`HTTPErrorProcessor`, :class:`DataHandler`.
settings are detected), :class:`UnknownHandler`, :class:`HTTPHandler`,
:class:`HTTPDefaultErrorHandler`, :class:`HTTPRedirectHandler`,
:class:`FTPHandler`, :class:`FileHandler`, :class:`HTTPErrorProcessor`.
If the Python installation has SSL support (i.e., if the :mod:`ssl` module
can be imported), :class:`HTTPSHandler` will also be added.
@ -257,12 +256,12 @@ The following classes are provided:
.. class:: ProxyHandler(proxies=None)
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`.
If no proxy environment variables are set, then 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 the OS X System
Configuration Framework.
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, then
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 the OS X System Configuration Framework.
To disable autodetected proxy pass an empty dictionary.