[Python-checkins] cpython (merge 3.5 -> default): Merge spelling fixes from 3.5
martin.panter
python-checkins at python.org
Mon Jun 20 04:33:11 EDT 2016
https://hg.python.org/cpython/rev/55ecc8fd88ac
changeset: 102107:55ecc8fd88ac
parent: 102105:ebc82b840163
parent: 102106:1cbe4cf863c5
user: Martin Panter <vadmium+py at gmail.com>
date: Mon Jun 20 07:55:14 2016 +0000
summary:
Merge spelling fixes from 3.5
files:
Doc/tools/extensions/suspicious.py | 2 +-
Objects/abstract.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/tools/extensions/suspicious.py b/Doc/tools/extensions/suspicious.py
--- a/Doc/tools/extensions/suspicious.py
+++ b/Doc/tools/extensions/suspicious.py
@@ -270,5 +270,5 @@
# ignore comments -- too much false positives.
# (although doing this could miss some errors;
# there were two sections "commented-out" by mistake
- # in the Python docs that would not be catched)
+ # in the Python docs that would not be caught)
raise nodes.SkipNode
diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2155,7 +2155,7 @@
where);
_PyErr_ChainExceptions(exc, val, tb);
#ifdef Py_DEBUG
- /* Ensure that the bug is catched in debug mode */
+ /* Ensure that the bug is caught in debug mode */
Py_FatalError("a function returned a result with an error set");
#endif
return NULL;
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list