From: Andrew Kuchling <amk@amk.ca>
Date: Sat, 15 Feb 2014 22:22:41 +0000 (-0500)
Subject: Merge from 3.3
X-Git-Tag: v3.4.1rc1~233^2~318
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3d0ffe2c63a6037189617229574c1d28cba9501;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.3
---

a3d0ffe2c63a6037189617229574c1d28cba9501
diff --cc Doc/glossary.rst
index 2f658aca0971,b48eb1ed5f76..f71a1f72e573
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@@ -783,10 -763,14 +783,18 @@@ Glossar
        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.
 +
     slice
        An object usually containing a portion of a :term:`sequence`.  A slice is
        created using the subscript notation, ``[]`` with colons between numbers