[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3: adjust set and frozenset function docs (issue #16436).
chris.jerdonek
python-checkins at python.org
Sat Nov 10 04:02:37 CET 2012
http://hg.python.org/cpython/rev/1fde0d70f2b8
changeset: 80335:1fde0d70f2b8
parent: 80331:7cfe8cd4d65e
parent: 80334:d534da27ca8b
user: Chris Jerdonek <chris.jerdonek at gmail.com>
date: Fri Nov 09 18:58:47 2012 -0800
summary:
Merge from 3.3: adjust set and frozenset function docs (issue #16436).
files:
Doc/library/functions.rst | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -547,11 +547,13 @@
.. function:: frozenset([iterable])
:noindex:
- Return a frozenset object, optionally with elements taken from *iterable*.
- The frozenset type is described in :ref:`types-set`.
+ Return a new :class:`frozenset` object, optionally with elements taken from
+ *iterable*. ``frozenset`` is a built-in class. See :class:`frozenset` and
+ :ref:`types-set` for documentation about this class.
- For other containers see the built in :class:`dict`, :class:`list`, and
- :class:`tuple` classes, and the :mod:`collections` module.
+ For other containers see the built-in :class:`set`, :class:`list`,
+ :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+ module.
.. function:: getattr(object, name[, default])
@@ -1170,8 +1172,13 @@
.. function:: set([iterable])
:noindex:
- Return a new set, optionally with elements taken from *iterable*.
- The set type is described in :ref:`types-set`.
+ Return a new :class:`set` object, optionally with elements taken from
+ *iterable*. ``set`` is a built-in class. See :class:`set` and
+ :ref:`types-set` for documentation about this class.
+
+ For other containers see the built-in :class:`frozenset`, :class:`list`,
+ :class:`tuple`, and :class:`dict` classes, as well as the :mod:`collections`
+ module.
.. function:: setattr(object, name, value)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list