[Python-checkins] [3.6] bpo-32664: Add missing "|" connector in Exceptions doc (GH-1173) (GH-5372)
Mariatta
webhook-mailer at python.org
Sat Jan 27 22:52:55 EST 2018
https://github.com/python/cpython/commit/d331515847f0a053b929e5a4795715cb111f42b3
commit: d331515847f0a053b929e5a4795715cb111f42b3
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2018-01-27T19:52:52-08:00
summary:
[3.6] bpo-32664: Add missing "|" connector in Exceptions doc (GH-1173) (GH-5372)
(cherry picked from commit 992ae6444cc745c23d3bcc604983cc8e39405bd2)
files:
M Doc/license.rst
M Lib/test/exception_hierarchy.txt
diff --git a/Doc/license.rst b/Doc/license.rst
index e8dbeb1ef28f..90190cd57e0c 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -571,7 +571,7 @@ The :mod:`test_epoll` contains the following notice::
Select kqueue
-------------
-The :mod:`select` and contains the following notice for the kqueue interface::
+The :mod:`select` contains the following notice for the kqueue interface::
Copyright (c) 2000 Doug White, 2006 James Knight, 2007 Christian Heimes
All rights reserved.
diff --git a/Lib/test/exception_hierarchy.txt b/Lib/test/exception_hierarchy.txt
index 7333b2aa6243..763a6c899b48 100644
--- a/Lib/test/exception_hierarchy.txt
+++ b/Lib/test/exception_hierarchy.txt
@@ -14,7 +14,7 @@ BaseException
+-- BufferError
+-- EOFError
+-- ImportError
- +-- ModuleNotFoundError
+ | +-- ModuleNotFoundError
+-- LookupError
| +-- IndexError
| +-- KeyError
More information about the Python-checkins
mailing list