New multi-level urllib import capability

Author: edschofield

docs/standard_library_imports.rst

@@ -25,6 +25,7 @@ The first interface is via a context-manager called ``hooks``::
         from collections import UserList
         from itertools import filterfalse, zip_longest
         from http.client import HttpConnection
+        import urllib.request
         # and other moved modules and definitions
 
 Direct interface

future/moves/_markupbase.py

@@ -4,4 +4,5 @@
 if PY3:
     from _markupbase import *
 else:
+    __future_module__ = True
     from markupbase import *

future/moves/html/__init__.py

@@ -4,6 +4,8 @@
 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/entities.py

@@ -4,4 +4,5 @@
 if PY3:
     from html.entities import *
 else:
+    __future_module__ = True
     from htmlentitydefs import *

future/moves/html/parser.py

@@ -4,4 +4,5 @@
 if PY3:
     from html.parser import *
 else:
+    __future_module__ = True
     from HTMLParser import *

future/moves/http/__init__.py

@@ -0,0 +1,4 @@
+from future.utils import PY3
+
+if not PY3:
+    __future_module__ = True

future/moves/http/client.py

@@ -4,3 +4,4 @@
     from http.client import *
 else:
     from httplib import *
+    __future_module__ = True

future/moves/http/cookiejar.py

@@ -4,4 +4,5 @@
 if PY3:
     from http.cookiejar import *
 else:
+    __future_module__ = True
     from cookielib import *

future/moves/http/cookies.py

@@ -4,5 +4,6 @@
 if PY3:
     from http.cookies import *
 else:
+    __future_module__ = True
     from Cookie import *
     from Cookie import Morsel    # left out of __all__ on Py2.7!

future/moves/http/server.py

@@ -4,6 +4,7 @@
 if PY3:
     from http.server import *
 else:
+    __future_module__ = True
     from BaseHTTPServer import *
     from CGIHTTPServer import *
     from SimpleHTTPServer import *