summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2016-06-03 19:40:29 (GMT)
committerR David Murray <rdmurray@bitdance.com>2016-06-03 19:40:29 (GMT)
commit11aaa42d1cc4011c3148641ea04316b58e000297 (patch)
tree1f7565aa78fafe98860b17f0f3dce40c750c01df
parent6f20bd6063380d47d4381295e3203466e762902c (diff)
downloadcpython-11aaa42d1cc4011c3148641ea04316b58e000297.zip
cpython-11aaa42d1cc4011c3148641ea04316b58e000297.tar.gz
cpython-11aaa42d1cc4011c3148641ea04316b58e000297.tar.bz2
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.
-rw-r--r--Doc/library/urllib.request.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 688f149..ac8da26 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