summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-04-19 23:23:16 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-04-19 23:23:16 +0000
commitabe4d52a1a175b784a5ccae6f31638fb9bf7bfe4 (patch)
treeb39ac1a830a308cc000244bccfd70d41468268b3 /Objects
parentf8d6f73f264f2adefdd87c03bebb66a069ead393 (diff)
parent8f26565ba9e3d32f6c953b04c1b9f9d13c2e1818 (diff)
downloadcpython-git-abe4d52a1a175b784a5ccae6f31638fb9bf7bfe4.tar.gz
Merge doc and comment fixes from 3.5
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 1bad9afcef..2086e9d243 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3925,7 +3925,7 @@ _PyObject_GetState(PyObject *obj, int required)
}
}
- /* The list is stored on the class so it may mutates while we
+ /* The list is stored on the class so it may mutate while we
iterate over it */
if (slotnames_size != Py_SIZE(slotnames)) {
PyErr_Format(PyExc_RuntimeError,
@@ -4059,7 +4059,7 @@ _PyObject_GetNewArguments(PyObject *obj, PyObject **args, PyObject **kwargs)
}
/* The object does not have __getnewargs_ex__ and __getnewargs__. This may
- means __new__ does not takes any arguments on this object, or that the
+ mean __new__ does not takes any arguments on this object, or that the
object does not implement the reduce protocol for pickling or
copying. */
*args = NULL;