summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-24 17:45:33 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-24 17:45:33 (GMT)
commit1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8 (patch)
treecc761ce57d4cf2a235d3b05960872e1f71aa2454
parent9b325b0acef6f94390ecd094e5935a3aeef7bef1 (diff)
parent17658a1ca0af87f43ca880b03c4368a81f3ad51a (diff)
downloadcpython-1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8.zip
cpython-1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8.tar.gz
cpython-1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8.tar.bz2
merge 3.2
-rw-r--r--Objects/typeobject.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 128b9fe..a597ba0 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2658,9 +2658,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")},
{"__dir__", type_dir, METH_NOARGS,
PyDoc_STR("__dir__() -> specialized __dir__ implementation for types")},
{0}
@@ -3573,7 +3573,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")},
{"__dir__", object_dir, METH_NOARGS,
PyDoc_STR("__dir__() -> default dir() implementation")},
{0}