[Python-checkins] cpython: psuedo merge: #22797: clarify when URLErrors are raised by urlopen.

[r.david.murray]

https://hg.python.org/cpython/rev/8b6b6add8e47
changeset:   101663:8b6b6add8e47
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Jun 03 15:40:29 2016 -0400
summary:
  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.

files:
  Doc/library/urllib.request.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


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
@@ -83,7 +83,7 @@
    :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

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