[Python-checkins] cpython (merge 3.3 -> default): Merge: Reflow paragraphs.

[r.david.murray]

http://hg.python.org/cpython/rev/7bccf474660e
changeset:   83540:7bccf474660e
parent:      83536:aca80409ecdd
parent:      83539:1489e3179614
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Apr 28 11:30:19 2013 -0400
summary:
  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.)

files:
  Doc/howto/urllib2.rst          |   8 ++++----
  Doc/library/urllib.request.rst |  19 +++++++++----------
  2 files changed, 13 insertions(+), 14 deletions(-)


diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -523,10 +523,10 @@
 
 **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)
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -129,10 +129,9 @@
    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 @@
 .. 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.
 

-- 
Repository URL: http://hg.python.org/cpython