Fix running of scripts from python-future source folder on Py3

Author: edschofield

_dummy_thread/__init__.py

@@ -5,6 +5,4 @@
 if sys.version_info[0] < 3:
     from dummy_thread import *
 else:
-    from future.standard_library import exclude_local_folder_imports
-    with exclude_local_folder_imports('_dummy_thread'):
-        from _dummy_thread import *
+    raise ImportError('Cannot import module from python-future source folder')

_markupbase/__init__.py

@@ -5,6 +5,4 @@
 if sys.version_info[0] < 3:
     from markupbase import *
 else:
-    from future.standard_library import exclude_local_folder_imports
-    with exclude_local_folder_imports('_markupbase'):
-        from _markupbase import *
+    raise ImportError('Cannot import module from python-future source folder')

_thread/__init__.py

@@ -5,6 +5,4 @@
 if sys.version_info[0] < 3:
     from dummy_thread import *
 else:
-    from future.standard_library import exclude_local_folder_imports
-    with exclude_local_folder_imports('_dummy_thread'):
-        from _dummy_thread import *
+    raise ImportError('Cannot import module from python-future source folder')

builtins/__init__.py

@@ -7,6 +7,4 @@
     # Overwrite any old definitions with the equivalent future.builtins ones:
     from future.builtins import *
 else:
-    from future.standard_library import exclude_local_folder_imports
-    with exclude_local_folder_imports('builtins'):
-        from builtins import *
+    raise ImportError('Cannot import module from python-future source folder')

configparser/__init__.py

@@ -4,6 +4,4 @@
 if sys.version_info[0] < 3:
     from ConfigParser import *
 else:
-    from future.standard_library import exclude_local_folder_imports
-    with exclude_local_folder_imports('configparser'):
-        from configparser import *
+    raise ImportError('Cannot import module from python-future source folder')

copyreg/__init__.py

@@ -2,6 +2,7 @@
 from future.utils import PY3
 
 if PY3:
+    raise ImportError('Cannot import module from python-future source folder')
     from copyreg import *
 else:
     __future_module__ = True

future/moves/__init__.py

@@ -1 +1,29 @@
 # future.moves package
+from __future__ import absolute_import
+import sys
+__future_module__ = True
+
+TOP_LEVEL_MODULES = ['builtins',
+                     'configparser',
+                     'copyreg',
+                     'html',
+                     'http',
+                     'queue',
+                     'reprlib',
+                     'socketserver',
+                     'tkinter',
+                     'winreg',
+                     'xmlrpc',
+                     '_dummy_thread',
+                     '_markupbase',
+                     '_thread',
+                    ]
+
+if sys.version_info[0] == 3:
+    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

future/moves/collections.py

@@ -1,9 +1,9 @@
 from __future__ import absolute_import
+from future.utils import PY2, PY26
+__future_module__ = True
 
 from collections import *
 
-from future.utils import PY2, PY26
-
 if PY2:
     from UserDict import UserDict
     from UserList import UserList

future/moves/html/__init__.py

@@ -1,10 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 from future.utils import PY3
+__future_module__ = True
 
 if PY3:
     from html import *
 else:
-    __future_module__ = True
 
     # cgi.escape isn't good enough for the single Py3.3 html test to pass.
     # Define it inline here instead. From the Py3.3 stdlib

future/moves/html/parser.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 from future.utils import PY3
+__future_module__ = True
 
 if PY3:
     from html.parser import *
 else:
-    __future_module__ = True
     from HTMLParser import *