Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.2

This commit is contained in:
Benjamin Peterson 2011-05-24 12:45:33 -05:00
parent 9b325b0ace 17658a1ca0
commit 1fdcf0e4b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Objects/typeobject.c
View File

@ -2658,9 +2658,9 @@ static PyMethodDef type_methods[] = {
PyDoc_STR("__prepare__() -> dict\n" PyDoc_STR("__prepare__() -> dict\n"
"used to create the namespace for the class statement")}, "used to create the namespace for the class statement")},
{"__instancecheck__", type___instancecheck__, METH_O, {"__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, {"__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, {"__dir__", type_dir, METH_NOARGS,
PyDoc_STR("__dir__() -> specialized __dir__ implementation for types")}, PyDoc_STR("__dir__() -> specialized __dir__ implementation for types")},
{0} {0}
@ -3573,7 +3573,7 @@ static PyMethodDef object_methods[] = {
{"__format__", object_format, METH_VARARGS, {"__format__", object_format, METH_VARARGS,
PyDoc_STR("default object formatter")}, PyDoc_STR("default object formatter")},
{"__sizeof__", object_sizeof, METH_NOARGS, {"__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, {"__dir__", object_dir, METH_NOARGS,
PyDoc_STR("__dir__() -> default dir() implementation")}, PyDoc_STR("__dir__() -> default dir() implementation")},
{0} {0}