From b8fbff889f78e1abb3992d9bf7e4949fbcfe26a0 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Wed, 24 Oct 2012 23:01:30 +0300 Subject: #16210: combine the two type() docs. Patch by Pete Sevander. --- Doc/library/functions.rst | 29 ++++++++++++----------------- Misc/ACKS | 1 + 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 84eed5c..936af52 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1426,26 +1426,21 @@ available. They are listed here in alphabetical order. .. function:: type(object) + type(name, bases, dict) .. index:: object: type - Return the type of an *object*. The return value is a type object. The - :func:`isinstance` built-in function is recommended for testing the type of an - object. - - With three arguments, :func:`type` functions as a constructor as detailed below. - - -.. function:: type(name, bases, dict) - :noindex: - - Return a new type object. This is essentially a dynamic form of the - :keyword:`class` statement. The *name* string is the class name and becomes the - :attr:`__name__` attribute; the *bases* tuple itemizes the base classes and - becomes the :attr:`__bases__` attribute; and the *dict* dictionary is the - namespace containing definitions for class body and becomes the :attr:`__dict__` - attribute. For example, the following two statements create identical - :class:`type` objects: + With one argument, return the type of an *object*. The return value is a + type object. The :func:`isinstance` built-in function is recommended for + testing the type of an object. + + With three arguments, return a new type object. This is essentially a + dynamic form of the :keyword:`class` statement. The *name* string is the + class name and becomes the :attr:`__name__` attribute; the *bases* tuple + itemizes the base classes and becomes the :attr:`__bases__` attribute; + and the *dict* dictionary is the namespace containing definitions for class + body and becomes the :attr:`__dict__` attribute. For example, the + following two statements create identical :class:`type` objects: >>> class X(object): ... a = 1 diff --git a/Misc/ACKS b/Misc/ACKS index 88b7ed0..ba6be3c 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -884,6 +884,7 @@ Jiwon Seo Joakim Sernbrant Roger Serwy Jerry Seutter +Pete Sevander Denis Severson Ian Seyer Ha Shao -- cgit v0.12