Add test to list of top-level modules to pre-import if we're in the python-future source folder

We now pre-import these from both future.moves and future.backports

Author: edschofield

future/backports/__init__.py

@@ -0,0 +1,9 @@
+# future.backports package
+from __future__ import absolute_import
+import sys
+__future_module__ = True
+
+from future.moves import import_top_level_modules
+
+if sys.version_info[0] == 3:
+    import_top_level_modules()

future/backports/test/support.py

@@ -9,7 +9,6 @@
 from future import utils
 from future.builtins import str, range, open, int, map, list
 
-
 # if __name__ != 'test.support':
 #     raise ImportError('support must be imported from the test package')
 

future/moves/__init__.py

@@ -11,6 +11,7 @@
                      'queue',
                      'reprlib',
                      'socketserver',
+                     'test',
                      'tkinter',
                      'winreg',
                      'xmlrpc',
@@ -19,11 +20,14 @@
                      '_thread',
                     ]
 
-if sys.version_info[0] == 3:
+def import_top_level_modules():
     from future.standard_library import exclude_local_folder_imports
     with exclude_local_folder_imports(*TOP_LEVEL_MODULES):
         for m in TOP_LEVEL_MODULES:
             try:
                 __import__(m)
             except ImportError:     # e.g. winreg
                 pass
+
+if sys.version_info[0] == 3:
+    import_top_level_modules()

future/standard_library/__init__.py

@@ -766,12 +766,12 @@ def __enter__(self):
         # Ensure we import the system module:
         for m in self.module_names:
             # Delete the module and any submodules from sys.modules:
-            for key in list(sys.modules):
-                if key == m or key.startswith(m + '.'):
-                    try:
-                        del sys.modules[key]
-                    except KeyError:
-                        pass
+            # for key in list(sys.modules):
+            #     if key == m or key.startswith(m + '.'):
+            #         try:
+            #             del sys.modules[key]
+            #         except KeyError:
+            #             pass
             try:
                 module = __import__(m, level=0)
             except ImportError: