summaryrefslogtreecommitdiffstats
path: root/Objects
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 /Objects
parent9b325b0acef6f94390ecd094e5935a3aeef7bef1 (diff)
parent17658a1ca0af87f43ca880b03c4368a81f3ad51a (diff)
downloadcpython-1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8.zip
cpython-1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8.tar.gz
cpython-1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8.tar.bz2
merge 3.2
Diffstat (limited to 'Objects')
-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}
size'>1865logstatsplain -rw-r--r--qdecorationplugin_qws.cpp3537logstatsplain -rw-r--r--qdecorationplugin_qws.h2441logstatsplain -rw-r--r--qdecorationstyled_qws.cpp12623logstatsplain -rw-r--r--qdecorationstyled_qws.h2234logstatsplain -rw-r--r--qdecorationwindows_qws.cpp12491logstatsplain -rw-r--r--qdecorationwindows_qws.h2394logstatsplain -rw-r--r--qdirectpainter_qws.cpp19498logstatsplain -rw-r--r--qdirectpainter_qws.h3161logstatsplain -rw-r--r--qkbd_defaultmap_qws_p.h37845logstatsplain -rw-r--r--qkbd_qws.cpp23238logstatsplain -rw-r--r--qkbd_qws.h2883logstatsplain -rw-r--r--qkbd_qws_p.h3659logstatsplain -rw-r--r--qkbddriverfactory_qws.cpp5562logstatsplain -rw-r--r--qkbddriverfactory_qws.h1963logstatsplain -rw-r--r--qkbddriverplugin_qws.cpp3911logstatsplain -rw-r--r--qkbddriverplugin_qws.h2595logstatsplain -rw-r--r--qkbdlinuxinput_qws.cpp7390logstatsplain -rw-r--r--qkbdlinuxinput_qws.h2148logstatsplain -rw-r--r--qkbdqnx_qws.cpp8295logstatsplain -rw-r--r--qkbdqnx_qws.h2072logstatsplain -rw-r--r--qkbdtty_qws.cpp10610logstatsplain -rw-r--r--qkbdtty_qws.h2054logstatsplain -rw-r--r--qkbdum_qws.cpp3976logstatsplain -rw-r--r--qkbdum_qws.h2017logstatsplain -rw-r--r--qkbdvfb_qws.cpp3724logstatsplain -rw-r--r--qkbdvfb_qws.h2195logstatsplain -rw-r--r--qlock.cpp8420logstatsplain -rw-r--r--qlock_p.h2636logstatsplain -rw-r--r--qmouse_qws.cpp21940logstatsplain -rw-r--r--qmouse_qws.h3424logstatsplain -rw-r--r--qmousedriverfactory_qws.cpp6065logstatsplain -rw-r--r--qmousedriverfactory_qws.h1909logstatsplain -rw-r--r--qmousedriverplugin_qws.cpp3910logstatsplain -rw-r--r--qmousedriverplugin_qws.h2577logstatsplain -rw-r--r--qmouselinuxinput_qws.cpp6008logstatsplain -rw-r--r--qmouselinuxinput_qws.h2114logstatsplain -rw-r--r--qmouselinuxtp_qws.cpp9333logstatsplain -rw-r--r--qmouselinuxtp_qws.h2180logstatsplain -rw-r--r--qmousepc_qws.cpp21680logstatsplain -rw-r--r--qmousepc_qws.h2067logstatsplain -rw-r--r--qmouseqnx_qws.cpp6548logstatsplain -rw-r--r--qmouseqnx_qws.h2137logstatsplain -rw-r--r--qmousetslib_qws.cpp9875logstatsplain -rw-r--r--qmousetslib_qws.h2285logstatsplain -rw-r--r--qmousevfb_qws.cpp3784logstatsplain -rw-r--r--qmousevfb_qws.h2220logstatsplain -rw-r--r--qscreen_qws.cpp96033logstatsplain -rw-r--r--qscreen_qws.h12200logstatsplain -rw-r--r--qscreendriverfactory_qws.cpp5920logstatsplain -rw-r--r--qscreendriverfactory_qws.h1885logstatsplain -rw-r--r--qscreendriverplugin_qws.cpp3894logstatsplain -rw-r--r--qscreendriverplugin_qws.h2531logstatsplain -rw-r--r--qscreenlinuxfb_qws.cpp41573logstatsplain -rw-r--r--qscreenlinuxfb_qws.h3429logstatsplain -rw-r--r--qscreenmulti_qws.cpp12206logstatsplain -rw-r--r--qscreenmulti_qws_p.h3205logstatsplain -rw-r--r--qscreenproxy_qws.cpp11933logstatsplain -rw-r--r--qscreenproxy_qws.h4104logstatsplain -rw-r--r--qscreenqnx_qws.cpp13757logstatsplain -rw-r--r--qscreenqnx_qws.h2130logstatsplain