Merge branch 'issue_158' into v0.14.x

Author: edschofield

src/future/standard_library/__init__.py

@@ -462,11 +462,11 @@ def install_aliases():
 
     # Hack for urllib so it appears to have the same structure on Py2 as on Py3
     import urllib
-    from future.moves.urllib import request
-    from future.moves.urllib import response
-    from future.moves.urllib import parse
-    from future.moves.urllib import error
-    from future.moves.urllib import robotparser
+    from future.backports.urllib import request
+    from future.backports.urllib import response
+    from future.backports.urllib import parse
+    from future.backports.urllib import error
+    from future.backports.urllib import robotparser
     urllib.request = request
     urllib.response = response
     urllib.parse = parse

tests/test_future/test_imports_urllib.py

@@ -2,6 +2,8 @@
 
 import sys
 from future.tests.base import unittest
+from future.standard_library import install_aliases
+
 
 class ImportUrllibTest(unittest.TestCase):
     def test_urllib(self):
@@ -16,6 +18,27 @@ def test_urllib(self):
             import urllib.response
         self.assertEqual(orig_file, urllib.__file__)
 
+    def test_issue_158(self):
+        """
+        CherryPy conditional import in _cpcompat.py: issue 158
+        """
+        install_aliases()
+        try:
+            from urllib.parse import unquote as parse_unquote
+
+            def unquote_qs(atom, encoding, errors='strict'):
+                return parse_unquote(
+                    atom.replace('+', ' '),
+                    encoding=encoding,
+                    errors=errors)
+        except ImportError:
+            from urllib import unquote as parse_unquote
+
+            def unquote_qs(atom, encoding, errors='strict'):
+                return parse_unquote(atom.replace('+', ' ')).decode(encoding, errors)
+        self.assertEqual(unquote_qs('/%7Econnolly/', 'utf-8'),
+                         '/~connolly/')
+
 
 if __name__ == '__main__':
     unittest.main()

tests/test_future/test_urllib.py

@@ -1005,10 +1005,11 @@ def test_nonstring_values(self):
         self.assertEqual("a=None", urllib_parse.urlencode({"a": None}))
 
     def test_nonstring_seq_values(self):
+        from future.backports import OrderedDict
         self.assertEqual("a=1&a=2", urllib_parse.urlencode({"a": [1, 2]}, True))
         self.assertEqual("a=None&a=a",
                          urllib_parse.urlencode({"a": [None, "a"]}, True))
-        data = collections.OrderedDict([("a", 1), ("b", 1)])
+        data = OrderedDict([("a", 1), ("b", 1)])
         self.assertEqual("a=a&a=b",
                          urllib_parse.urlencode({"a": data}, True))
 

tests/test_future/test_urllib2.py

@@ -5,7 +5,8 @@
 import array
 import sys
 
-from future.standard_library import import_, install_aliases
+import http.client
+from future.standard_library import install_aliases
 from future.backports.test import support
 import future.backports.urllib.request as urllib_request
 # The proxy bypass method imported below has logic specific to the OSX
@@ -448,8 +449,6 @@ def reset(self):
         self.requests = []
     def http_open(self, req):
         import future.backports.email as email
-        from future import standard_library
-        http = import_('http.client', backport=True)
         import copy
         self.requests.append(copy.deepcopy(req))
         if self._count == 0: