More refactoring -> future.backports

Author: edschofield

future/standard_library/__init__.py

@@ -385,9 +385,8 @@ def is_py2_stdlib_module(m):
 def scrub_py2_sys_modules():
     """
     Removes any Python 2 standard library modules from ``sys.modules`` that
-    would interfere with Py3-style imports using ``future.standard_library``
-    import hooks. Examples are modules with the same names (like urllib
-    or email).
+    would interfere with Py3-style imports using import hooks. Examples are
+    modules with the same names (like urllib or email).
 
     (Note that currently import hooks are disabled for modules like these
     with ambiguous names anyway ...)
@@ -436,7 +435,7 @@ def scrub_future_sys_modules():
 
     This function removes items matching this spec from sys.modules:
         key: new_py3_module_name
-        value: either future.standard_library module or py2 module with
+        value: either future.backports module or py2 module with
                another name
     """
     scrubbed = {}
@@ -714,7 +713,7 @@ def import_(module_name, backport=False):
 
     Note that this would be a SyntaxError in Python:
 
-        >>> from future.standard_library import http.client
+        >>> from future.backports import http.client
 
     """
 
@@ -725,7 +724,7 @@ def import_(module_name, backport=False):
         # Then http.client = client
         # etc.
         if backport:
-            prefix = 'future.standard_library'
+            prefix = 'future.backports'
         else:
             prefix = 'future.moves'
         parts = prefix.split('.') + module_name.split('.')
@@ -739,7 +738,7 @@ def import_(module_name, backport=False):
                 break
             setattr(modules[i-1], part, modules[i])
 
-        # Return the next-most top-level module after future.standard_library:
+        # Return the next-most top-level module after future.backports / future.moves:
         return modules[2]
 
 
@@ -767,7 +766,7 @@ def from_import(module_name, *symbol_names, **kwargs):
         return __import__(module_name)
     else:
         if 'backport' in kwargs and bool(kwargs['backport']):
-            prefix = 'future.standard_library'
+            prefix = 'future.backports'
         else:
             prefix = 'future.moves'
         parts = prefix.split('.') + module_name.split('.')

future/tests/test_httplib.py

@@ -11,8 +11,8 @@
 from future import utils
 from future.tests.base import unittest, skip26
 
-from future.standard_library.http import client
-from future.standard_library.test import support
+from future.backports.http import client
+from future.backports.test import support
 import array
 import io
 import socket

future/tests/test_standard_library.py

@@ -34,9 +34,9 @@ def test_can_import_several(self):
             standard_library.remove_hooks()
         """
 
-        import future.standard_library.urllib.parse as urllib_parse
-        import future.standard_library.urllib.request as urllib_request
-        from future.standard_library.test import support
+        import future.moves.urllib.parse as urllib_parse
+        import future.moves.urllib.request as urllib_request
+        from future.moves.test import support
 
         with standard_library.hooks():
             import http.server
@@ -310,13 +310,13 @@ def test_builtins(self):
         import builtins
         self.assertTrue(hasattr(builtins, 'tuple'))
 
-    @unittest.skip("ssl support has been stripped out for now ...")
+    # @unittest.skip("ssl support has been stripped out for now ...")
     def test_urllib_request_ssl_redirect(self):
         """
         This site redirects to https://...
         It therefore requires ssl support.
         """
-        import future.standard_library.urllib.request as urllib_request
+        import future.moves.urllib.request as urllib_request
         from pprint import pprint
         URL = 'http://pypi.python.org/pypi/{0}/json'
         package = 'future'
@@ -328,7 +328,7 @@ def test_urllib_request_http(self):
         """
         This site (amazon.com) uses plain http (as of 2014-04-12).
         """
-        import future.standard_library.urllib.request as urllib_request
+        import future.moves.urllib.request as urllib_request
         from pprint import pprint
         URL = 'http://amazon.com'
         r = urllib_request.urlopen(URL)
@@ -352,13 +352,23 @@ def test_other_http_imports(self):
         import http.cookiejar
         self.assertTrue(True)
 
-    def test_urllib_imports(self):
-        import future.standard_library.urllib
-        import future.standard_library.urllib.parse
-        import future.standard_library.urllib.request
-        import future.standard_library.urllib.robotparser
-        import future.standard_library.urllib.error
-        import future.standard_library.urllib.response
+    def test_urllib_imports_direct(self):
+        import future.moves.urllib
+        import future.moves.urllib.parse
+        import future.moves.urllib.request
+        import future.moves.urllib.robotparser
+        import future.moves.urllib.error
+        import future.moves.urllib.response
+        self.assertTrue(True)
+
+    def test_urllib_imports_cm(self):
+        with standard_library.hooks():
+            import urllib
+            import urllib.parse
+            import urllib.request
+            import urllib.robotparser
+            import urllib.error
+            import urllib.response
         self.assertTrue(True)
 
     def test_underscore_prefixed_modules(self):

future/tests/test_urlparse.py

@@ -9,7 +9,7 @@
 from __future__ import absolute_import
 from future import standard_library
 
-import future.standard_library.urllib.parse as urllib_parse
+import future.backports.urllib.parse as urllib_parse
 from future.tests.base import unittest
 
 RFC1808_BASE = "http://a/b/c/d;p?q#f"