[Python-checkins] cpython (merge default -> 3.5): Merge: #22797: clarify when URLErrors are raised by urlopen.

[r.david.murray]

https://hg.python.org/cpython/rev/d085b4f779af
changeset:   101659:d085b4f779af
branch:      3.5
parent:      101657:19488e23dcdb
parent:      101658:aed4b9981fca
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Jun 03 13:32:48 2016 -0400
summary:
  Merge: #22797: clarify when URLErrors are raised by urlopen.

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