[Python-checkins] cpython (2.7): #16210: combine the two type() docs. Patch by Pete Sevander.
ezio.melotti
python-checkins at python.org
Wed Oct 24 22:07:55 CEST 2012
http://hg.python.org/cpython/rev/6dde85f2e4af
changeset: 79926:6dde85f2e4af
branch: 2.7
parent: 79908:84cd07899baf
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Wed Oct 24 23:01:30 2012 +0300
summary:
#16210: combine the two type() docs. Patch by Pete Sevander.
files:
Doc/library/functions.rst | 27 +++++++++++----------------
Misc/ACKS | 1 +
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1426,26 +1426,21 @@
.. 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 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, :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 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -884,6 +884,7 @@
Joakim Sernbrant
Roger Serwy
Jerry Seutter
+Pete Sevander
Denis Severson
Ian Seyer
Ha Shao
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list