psuedo merge: #22797: clarify when URLErrors are raised by urlopen.

bitdancer · bitdancer · commit 11aaa42d1cc4 · 2016-06-03T15:40:29.000-04:00
I'm not sure how my previous merge commit got screwed up, hopefully this
one will do the right thing.
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
@@ -83,7 +83,7 @@ The :mod:`urllib.request` module defines the following functions:
    :class:`URLopener` and :class:`FancyURLopener` classes, this function
    returns a :class:`urllib.response.addinfourl` object.
 
-   Raises :exc:`~urllib.error.URLError` on errors.
+   Raises :exc:`~urllib.error.URLError` on protocol errors.
 
    Note that ``None`` may be returned if no handler handles the request (though
    the default installed global :class:`OpenerDirector` uses
