diff options
author | R David Murray <rdmurray@bitdance.com> | 2013-04-28 15:24:35 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2013-04-28 15:24:35 (GMT) |
commit | 9330a94467af5b9878ef0fb30da45d964cd735df (patch) | |
tree | 18273c494c46494493fd36eb0ea52784b83520a1 /Doc/library | |
parent | 5aea37ad1dad0841ab6b5408156cff592fbfa310 (diff) | |
download | cpython-9330a94467af5b9878ef0fb30da45d964cd735df.zip cpython-9330a94467af5b9878ef0fb30da45d964cd735df.tar.gz cpython-9330a94467af5b9878ef0fb30da45d964cd735df.tar.bz2 |
Reflow paragraphs.
I know one of them looks worse, but now it is <80 chars and
matches the 2.7 text.
Diffstat (limited to 'Doc/library')
-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 0ccfda2..f525e45 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`. + 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. |