Add a more complete set of future.moves stdlib interfaces (issue #104)

Author: edschofield

docs/standard_library_imports.rst

@@ -8,10 +8,71 @@ the standard Python 3 names and locations, it provides access to either the
 corresponding native standard library modules (``future.moves``) or to backported
 modules from Python 3.3 (``future.backports``).
 
+.. _list-standard-library-moves:
+
+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
+
+    import configparser
+    import copyreg
+
+    import dbm
+    import dbm.dumb
+    import dbm.gnu
+    import dbm.ndbm
+
+    from itertools import filterfalse, zip_longest
+
+    import html
+    import html.entities
+    import html.parser
+
+    import http
+    import http.client
+    import http.cookies
+    import http.cookiejar
+    import http.server
+
+    import queue
+
+    import socketserver
+
+    from subprocess import check_output            # backported to Py2.6
+    from subprocess import getoutput, getstatusoutput
+
+    from sys import intern
+
+    import urllib.error
+    import urllib.parse
+    import urllib.request
+    import urllib.response
+    import urllib.robotparser
+
+    import winreg                                  # Windows only
+
+    import xmlrpc.client
+    import xmlrpc.server
+
+    import _dummy_thread
+    import _markupbase
+    import _thread
+
+..  Disabled: import test.support
+
+
+
+Interfaces
+----------
+
 There are currently four interfaces to the reorganized standard library.
 
 Context-manager interface
--------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The recommended interface is via a context-manager called ``hooks``::
 
@@ -29,7 +90,7 @@ The recommended interface is via a context-manager called ``hooks``::
         # and other moved modules and definitions
 
 Direct interface
-----------------
+~~~~~~~~~~~~~~~~
 
 The second interface avoids import hooks. It may therefore be more
 robust, at the cost of less idiomatic code. Use it as follows::
@@ -53,7 +114,7 @@ One workaround is to replace the dot with an underscore::
     import future.moves.http.client as http_client
 
 ``import_`` and ``from_import`` functions
------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 A third interface, which also works with two-level imports, is to use the
 ``import_`` and ``from_import`` functions from ``future.standard_library`` as
@@ -67,7 +128,7 @@ follows::
     urlopen, urlsplit = from_import('urllib.request', 'urlopen', 'urlsplit')
 
 install_hooks() call
---------------------
+~~~~~~~~~~~~~~~~~~~~
 
 The fourth interface to the reorganized standard library is via an
 explicit call to ``install_hooks()``::
@@ -114,39 +175,6 @@ modules on Py2::
 .. but it has the advantage that it can be used by automatic translation scripts such as ``futurize`` and ``pasteurize``.
 
 
-List of standard library modules
---------------------------------
-
-The complete list of modules available via one of the four interfaces above is::
-
-    import socketserver
-    import queue
-    import configparser
-    from collections import UserList
-    from collections import Counter, OrderedDict   # backported to Py2.6
-    from itertools import filterfalse, zip_longest
-    
-    import html
-    import html.entities
-    import html.parser
-
-    import http
-    import http.client
-    import http.server
-    import http.cookies
-    import http.cookiejar
-    
-    import urllib
-    import urllib.parse
-    import urllib.request
-    import urllib.error
-
-    import xmlrpc.client
-    import xmlrpc.server
-
-..  Disabled: import test.support
-
-
 Comparing future.moves and six.moves
 ------------------------------------
 

docs/whatsnew.rst

@@ -3,6 +3,13 @@
 What's New
 **********
 
+What's new in version 0.13.2
+============================
+
+This release expands the ``future.moves`` package to include most of the remaining
+modules that were moved in the standard library reorganization (PEP 3108).
+(Issue #104). See :ref:`list-standard-library-moves` for an updated list.
+
 What's new in version 0.13.1
 ============================
 

future/moves/_dummy_thread.py

@@ -0,0 +1,8 @@
+from __future__ import absolute_import
+from future.utils import PY3
+
+if PY3:
+    from _dummy_thread import *
+else:
+    __future_module__ = True
+    from dummy_thread import *

future/moves/_thread.py

@@ -0,0 +1,8 @@
+from __future__ import absolute_import
+from future.utils import PY3
+
+if PY3:
+    from _thread import *
+else:
+    __future_module__ = True
+    from thread import *

future/moves/builtins.py

@@ -0,0 +1,10 @@
+from __future__ import absolute_import
+from future.utils import PY3
+
+if PY3:
+    from builtins import *
+else:
+    __future_module__ = True
+    from __builtin__ import *
+    # Overwrite any old definitions with the equivalent future.builtins ones:
+    from future.builtins import *

future/moves/collections.py

@@ -0,0 +1,12 @@
+from __future__ import absolute_import
+
+from collections import *
+
+from future.utils import PY2, PY26
+
+if PY2:
+    from UserList import UserList
+    from UserDict import UserDict
+
+if PY26:
+    from future.backports.misc import OrderedDict, Counter

future/moves/configparser.py

@@ -0,0 +1,8 @@
+from __future__ import absolute_import
+
+from future.utils import PY2
+
+if PY2:
+    from ConfigParser import *
+else:
+    from configparser import *

future/moves/copyreg.py

@@ -0,0 +1,8 @@
+from __future__ import absolute_import
+from future.utils import PY3
+
+if PY3:
+    from copyreg import *
+else:
+    __future_module__ = True
+    from copy_reg import *

future/moves/dbm/__init__.py

@@ -0,0 +1,20 @@
+from __future__ import absolute_import
+from future.utils import PY3
+
+if PY3:
+    from dbm import *
+else:
+    __future_module__ = True
+    from whichdb import *
+    from anydbm import *
+
+# Py3.3's dbm/__init__.py imports ndbm but doesn't expose it via __all__.
+# In case some (badly written) code depends on dbm.ndbm after import dbm,
+# we simulate this:
+if PY3:
+    from dbm import ndbm
+else:
+    try:
+        from future.moves.dbm import ndbm
+    except ImportError:
+        ndbm = None

future/moves/dbm/dumb.py

@@ -0,0 +1,9 @@
+from __future__ import absolute_import
+
+from future.utils import PY3
+
+if PY3:
+    from dbm.dumb import *
+else:
+    __future_module__ = True
+    from dumbdbm import *