ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from 3.3

Browse source
This commit is contained in:
Andrew Kuchling 2014-02-15 17:22:41 -05:00
commit a3d0ffe2c6
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Doc/glossary.rst
View file

@ -783,6 +783,14 @@ Glossary
mapping rather than a sequence because the lookups use arbitrary
:term:`immutable` keys rather than integers.
The :class:`collections.abc.Sequence` abstract base class
defines a much richer interface that goes beyond just
:meth:`__getitem__` and :meth:`__len__`, adding :meth:`count`,
:meth:`index`, :meth:`__contains__`, and
:meth:`__reversed__`. Types that implement this expanded
interface can be registered explicitly using
:func:`~abc.register`.
single dispatch
A form of :term:`generic function` dispatch where the implementation is
chosen based on the type of a single argument.

2
Doc/library/ipaddress.rst
View file

@ -167,7 +167,7 @@ write code that handles both IP versions correctly.
.. attribute:: is_unspecified
``True`` if the address is unspecified. See :RFC:`5375` (for IPv4)
``True`` if the address is unspecified. See :RFC:`5735` (for IPv4)
or :RFC:`2373` (for IPv6).
.. attribute:: is_reserved