The __all__ value for 'collections' was missing UserList and UserString.

diff --git a/Lib/collections.py b/Lib/collections.py
index dafc5e574660eb181a06d747f458dc3a0f78fdd4..f74614534b2d3c874a5fcf72d5c11f9efc358d7e 100644 (file)
--- 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 3ba23dea2b2574b2c82264baa01fe5cf0c3d679d..57d89e025cfa5cabe4a822039eecb6738fb8f93f 100644 (file)
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -44,6 +44,7 @@ class AllTest(unittest.TestCase):
         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 f61b3dc7b31f531a2a3d44df5830205baaa8adde..50a24e8cdc239ecbf755878b5dc757866c0024a4 100644 (file)
--- 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.