[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/80590e616f39
changeset:   83335:80590e616f39
parent:      83332:430dd4c508c2
parent:      83334:d728b5c703c2
user:        Georg Brandl <georg at python.org>
date:        Sun Apr 14 10:50:13 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/collections.abc.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst
--- a/Doc/library/collections.abc.rst
+++ b/Doc/library/collections.abc.rst
@@ -128,7 +128,7 @@
 particular functionality, for example::
 
     size = None
-    if isinstance(myvar, collections.Sized):
+    if isinstance(myvar, collections.abc.Sized):
         size = len(myvar)
 
 Several of the ABCs are also useful as mixins that make it easier to develop
@@ -138,7 +138,7 @@
 The ABC supplies the remaining methods such as :meth:`__and__` and
 :meth:`isdisjoint`::
 
-    class ListBasedSet(collections.Set):
+    class ListBasedSet(collections.abc.Set):
          ''' Alternate set implementation favoring space over speed
              and not requiring the set elements to be hashable. '''
          def __init__(self, iterable):

-- 
Repository URL: http://hg.python.org/cpython