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

Merge from 3.2: adjust set and frozenset function docs (issue #16436).

This commit is contained in:
Chris Jerdonek 2012-11-09 18:58:06 -08:00
parent fe08756743 df3abec2c9
commit 296c2fd065
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Doc/library/functions.rst
View File

@ -547,11 +547,13 @@ are always available. They are listed here in alphabetical order.
.. 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 @@ are always available. They are listed here in alphabetical order.
.. 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)