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.
This commit is contained in:
R David Murray 2016-06-03 15:40:29 -04:00
parent 6f20bd6063
commit 11aaa42d1c
1 changed files with 1 additions and 1 deletions

View File

@ -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