diff options
| author | R David Murray <rdmurray@bitdance.com> | 2013-04-28 15:30:19 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2013-04-28 15:30:19 (GMT) |
| commit | d4c1b36c39b792f1b001979ebf2858444a4df095 (patch) | |
| tree | b68922d347d6e90a4323edec72939fd7ee41136b /Doc/library/urllib.request.rst | |
| parent | 876f08e3ae9de32447c5dfae580693f0aaa1f17a (diff) | |
| parent | 9330a94467af5b9878ef0fb30da45d964cd735df (diff) | |
| download | cpython-d4c1b36c39b792f1b001979ebf2858444a4df095.zip cpython-d4c1b36c39b792f1b001979ebf2858444a4df095.tar.gz cpython-d4c1b36c39b792f1b001979ebf2858444a4df095.tar.bz2 | |
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.)
Diffstat (limited to 'Doc/library/urllib.request.rst')
| -rw-r--r-- | Doc/library/urllib.request.rst | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index a027c53..3908bd1 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -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. |