From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Sep 2011 16:55:34 +0000 (-0400)
Subject: add ChainMap to __all__ (closes #12959)
X-Git-Tag: v3.3.0a1~1550
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c92f6226d7e83a93a8ab535d3e964ae50c2c5272;p=thirdparty%2FPython%2Fcpython.git

add ChainMap to __all__ (closes #12959)

Thanks July Tikhonov.
---

diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 2007e6881699..e5e027700a4c 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -1,5 +1,5 @@
 __all__ = ['deque', 'defaultdict', 'namedtuple', 'UserDict', 'UserList',
-            'UserString', 'Counter', 'OrderedDict']
+            'UserString', 'Counter', 'OrderedDict', 'ChainMap']
 
 # For backwards compatibility, continue to make the collections ABCs
 # available through the collections module.
diff --git a/Misc/NEWS b/Misc/NEWS
index ef12cfda024d..d94f33c73fe0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -274,6 +274,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #12959: Add collections.ChainMap to collections.__all__.
+
 - Issue #12567: Add curses.unget_wch() function. Push a character so the next
   get_wch() will return it.