summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-14 09:54:57 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2017-01-14 09:54:57 (GMT)
commit4659ddc433205a4e02e365b9b299221d7ac12113 (patch)
treed1ff48bf6faeda88d32af413d9230220666fa960 /Modules
parent758c7d044bb98da9e98654fa91961f54a915712d (diff)
parent8f1378366e9fc0d7f22fda302f04bf822ae34cc1 (diff)
downloadcpython-4659ddc433205a4e02e365b9b299221d7ac12113.zip
cpython-4659ddc433205a4e02e365b9b299221d7ac12113.tar.gz
cpython-4659ddc433205a4e02e365b9b299221d7ac12113.tar.bz2
Merge doc fixes from 3.5
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_collectionsmodule.c2
-rw-r--r--Modules/_io/textio.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 6608798..e6111c6 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -2234,7 +2234,7 @@ static PyTypeObject defdict_type = {
PyDoc_STRVAR(_count_elements_doc,
"_count_elements(mapping, iterable) -> None\n\
\n\
-Count elements in the iterable, updating the mappping");
+Count elements in the iterable, updating the mapping");
static PyObject *
_count_elements(PyObject *self, PyObject *args)
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 1c7200b..4df5562 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1012,7 +1012,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
errors);
if (self->encoder == NULL)
goto error;
- /* Get the normalized named of the codec */
+ /* Get the normalized name of the codec */
res = _PyObject_GetAttrId(codec_info, &PyId_name);
if (res == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError))