Make a urllib test run on Py2.6 and modernize a test

Author: edschofield

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: