Add collections.UserString

Author: edschofield

docs/quickstart.rst

@@ -99,7 +99,7 @@ be accessed under their Python 3 names and locations in Python 2::
         import socketserver
         import queue
         import configparser
-        from collections import UserList
+        from collections import UserDict, UserList, UserString
         from collections import Counter, OrderedDict   # even on Py2.6
         from itertools import filterfalse, zip_longest
 
@@ -122,6 +122,7 @@ be accessed under their Python 3 names and locations in Python 2::
         import xmlrpc.client
         import xmlrpc.server
 
+and others. For a complete list, see :ref:`list-standard-library-moves`.
 
 .. _py2-dependencies:
 

docs/standard_library_imports.rst

@@ -16,7 +16,7 @@ List of moved standard library modules
 The complete list of modules available via one of the interfaces below is::
 
     from collections import Counter, OrderedDict   # backported to Py2.6
-    from collections import UserList, UserDict
+    from collections import UserDict, UserList, UserString
 
     import configparser
     import copyreg

future/moves/collections.py

@@ -5,8 +5,9 @@
 from future.utils import PY2, PY26
 
 if PY2:
-    from UserList import UserList
     from UserDict import UserDict
+    from UserList import UserList
+    from UserString import UserString
 
 if PY26:
     from future.backports.misc import OrderedDict, Counter

future/standard_library/__init__.py

@@ -30,7 +30,7 @@
 
     from itertools import filterfalse, zip_longest
     from sys import intern
-    from collections import UserList, UserDict
+    from collections import UserDict, UserList, UserString
     from collections import OrderedDict, Counter     # even on Py2.6
     from subprocess import getoutput, getstatusoutput
     from subprocess import check_output              # even on Py2.6

future/tests/test_standard_library.py

@@ -406,6 +406,7 @@ def test_reload(self):
         imp.reload(imp)
         self.assertTrue(True)
 
+
 class TestFutureMoves(CodeHandler):
     def test_future_moves_urllib_request(self):
         from future.moves.urllib import request as urllib_request
@@ -444,7 +445,7 @@ def test_future_moves(self):
         claim and expect. (Issue #104).
         """
         from future.moves.collections import Counter, OrderedDict   # backported to Py2.6
-        from future.moves.collections import UserDict, UserList
+        from future.moves.collections import UserDict, UserList, UserString
 
         from future.moves import configparser
         from future.moves import copyreg