summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-02 10:11:18 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-02 10:11:18 (GMT)
commit0b7d84de6b3ec5264392e3bf7d3900b003cbeffd (patch)
tree12987b101c150c8f44514c5a1421f3fa168c82d4 /Objects
parentfa6de5cddf9cd2029b7c2a0fe8b4c5ef27a1273e (diff)
parente26da7c03a714faa115fe6b708ef0730119aa4b3 (diff)
downloadcpython-0b7d84de6b3ec5264392e3bf7d3900b003cbeffd.zip
cpython-0b7d84de6b3ec5264392e3bf7d3900b003cbeffd.tar.gz
cpython-0b7d84de6b3ec5264392e3bf7d3900b003cbeffd.tar.bz2
Issue #27171: Merge typo fixes from 3.5
Diffstat (limited to 'Objects')
-rw-r--r--Objects/exceptions.c2
-rw-r--r--Objects/unicodeobject.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 2c7688c..7bc9310 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -870,7 +870,7 @@ oserror_use_init(PyTypeObject *type)
solution, given __new__ takes a variable number of arguments,
is to defer arg parsing and initialization to __init__.
- But when __new__ is overriden as well, it should call our __new__
+ But when __new__ is overridden as well, it should call our __new__
with the right arguments.
(see http://bugs.python.org/issue12555#msg148829 )
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 1e7cba6..7de44ce 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9492,7 +9492,7 @@ tailmatch(PyObject *self,
PyUnicode_GET_LENGTH(substring) *
PyUnicode_KIND(substring));
}
- /* otherwise we have to compare each character by first accesing it */
+ /* otherwise we have to compare each character by first accessing it */
else {
/* We do not need to compare 0 and len(substring)-1 because
the if statement above ensured already that they are equal