From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 3 Jun 2016 19:40:29 +0000 (-0400)
Subject: psuedo merge: #22797: clarify when URLErrors are raised by urlopen.
X-Git-Tag: v3.6.0a2~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11aaa42d1cc4011c3148641ea04316b58e000297;p=python

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

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
index 688f1493c4..ac8da26c83 100644
--- 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