From 23a4a7b5a129c18e20e11e48983c2d29ea7728aa Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Mon, 12 May 2008 00:56:28 +0000
Subject: [PATCH] The __all__ value for 'collections' was missing UserList and
 UserString.

---
 Lib/collections.py       | 3 ++-
 Lib/test/test___all__.py | 1 +
 Misc/NEWS                | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Lib/collections.py b/Lib/collections.py
index dafc5e57466..f74614534b2 100644
--- a/Lib/collections.py
+++ b/Lib/collections.py
@@ -1,4 +1,5 @@
-__all__ = ['deque', 'defaultdict', 'namedtuple', 'UserDict']
+__all__ = ['deque', 'defaultdict', 'namedtuple', 'UserDict', 'UserList',
+            'UserString']
 # For bootstrapping reasons, the collection ABCs are defined in _abcoll.py.
 # They should however be considered an integral part of collections.py.
 from _abcoll import *
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 3ba23dea2b2..57d89e025cf 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -44,6 +44,7 @@ def test_all(self):
         self.check_all("bdb")
         self.check_all("binhex")
         self.check_all("calendar")
+        self.check_all("collections")
         self.check_all("cgi")
         self.check_all("cmd")
         self.check_all("code")
diff --git a/Misc/NEWS b/Misc/NEWS
index f61b3dc7b31..50a24e8cdc2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,8 @@ Extension Modules
 Library
 -------
 
+- Fix the __all__ setting on 'collections' to include UserList and UserString.
+
 - The sre module has been removed.
 
 - The Queue module has been renamed to queue.