summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-24 17:44:26 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-24 17:44:26 (GMT)
commit17658a1ca0af87f43ca880b03c4368a81f3ad51a (patch)
tree829d376e7584b6fb0a1e74690453bc1a74a12a22
parent48e21fc46f3348c987d671ac4068a03c169ea801 (diff)
parentfbe56bb8bdc40179e42ef14e59b2b24df902c52a (diff)
downloadcpython-17658a1ca0af87f43ca880b03c4368a81f3ad51a.zip
cpython-17658a1ca0af87f43ca880b03c4368a81f3ad51a.tar.gz
cpython-17658a1ca0af87f43ca880b03c4368a81f3ad51a.tar.bz2
merge 3.1
-rw-r--r--Objects/typeobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 8eaf51f..3c724fd 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2582,9 +2582,9 @@ static PyMethodDef type_methods[] = {
PyDoc_STR("__prepare__() -> dict\n"
"used to create the namespace for the class statement")},
{"__instancecheck__", type___instancecheck__, METH_O,
- PyDoc_STR("__instancecheck__() -> check if an object is an instance")},
+ PyDoc_STR("__instancecheck__() -> bool\ncheck if an object is an instance")},
{"__subclasscheck__", type___subclasscheck__, METH_O,
- PyDoc_STR("__subclasscheck__() -> check if a class is a subclass")},
+ PyDoc_STR("__subclasscheck__() -> bool\ncheck if a class is a subclass")},
{0}
};
@@ -3430,7 +3430,7 @@ static PyMethodDef object_methods[] = {
{"__format__", object_format, METH_VARARGS,
PyDoc_STR("default object formatter")},
{"__sizeof__", object_sizeof, METH_NOARGS,
- PyDoc_STR("__sizeof__() -> size of object in memory, in bytes")},
+ PyDoc_STR("__sizeof__() -> int\nsize of object in memory, in bytes")},
{0}
};