diff options
| author | Andrew Kuchling <amk@amk.ca> | 2014-02-15 22:22:41 (GMT) |
|---|---|---|
| committer | Andrew Kuchling <amk@amk.ca> | 2014-02-15 22:22:41 (GMT) |
| commit | a3d0ffe2c63a6037189617229574c1d28cba9501 (patch) | |
| tree | 9734b30e7c0b8512a453fff17b761d579c48a8c1 | |
| parent | ac6e57869136e39b0141ce0722099f7fe1476b94 (diff) | |
| parent | e5235f162449f5faf63381197f243ef8d51acd19 (diff) | |
| download | cpython-a3d0ffe2c63a6037189617229574c1d28cba9501.zip cpython-a3d0ffe2c63a6037189617229574c1d28cba9501.tar.gz cpython-a3d0ffe2c63a6037189617229574c1d28cba9501.tar.bz2 | |
Merge from 3.3
| -rw-r--r-- | Doc/glossary.rst | 8 | ||||
| -rw-r--r-- | Doc/library/ipaddress.rst | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 2f658ac..f71a1f7 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -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. diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst index 9ccf262..aedf5c2 100644 --- a/Doc/library/ipaddress.rst +++ b/Doc/library/ipaddress.rst @@ -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 |