[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1

Tue May 24 19:46:11 CEST 2011

http://hg.python.org/cpython/rev/72e93f0ebe36
changeset: 70340:72e93f0ebe36
branch: 3.2
parent: 70336:5943621ba121
parent: 70338:310b484ebd91
user: Benjamin Peterson <benjamin at python.org>
date: Tue May 24 12:44:26 2011 -0500
summary:
 merge 3.1
files:
 Objects/typeobject.c | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2582,9 +2582,9 @@
 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 @@
 {"__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}
 };
 
-- 
Repository URL: http://hg.python.org/cpython
