Remove some remaining invocations of test.test_support (issue #109)

Author: edschofield

src/future/backports/test/support.py

@@ -9,9 +9,6 @@
 from future import utils
 from future.builtins import str, range, open, int, map, list
 
-# if __name__ != 'test.support':
-#     raise ImportError('support must be imported from the test package')
-
 import contextlib
 import errno
 import functools

tests/test_future/test_urllib_response.py

@@ -22,6 +22,7 @@ def readline(self):
     def close(self):
         self.closed = True
 
+
 class Testaddbase(unittest.TestCase):
 
     # TODO(jhylton): Write tests for other functionality of addbase()
@@ -39,8 +40,6 @@ def f():
         self.assertTrue(self.fp.closed)
         self.assertRaises(ValueError, f)
 
-def test_main():
-    test_support.run_unittest(Testaddbase)
 
 if __name__ == '__main__':
-    test_main()
+    unittest.main()

tests/test_past/test_olddict.py

@@ -7,7 +7,7 @@
 import os
 import sys
 
-from future.utils import implements_iterator, PY26, PY3
+from future.utils import implements_iterator, PY3
 from future.tests.base import unittest, skip26
 from past.builtins import dict
 
@@ -785,19 +785,7 @@ def test_tuple_keyerror(self):
     #     self._tracked(MyDict())
 
 
-def test_main():
-    if PY3:
-        from test import support as test_support
-    else:
-        from test import test_support
-
+if __name__ == '__main__':
     # Only run these tests on Python 3 ...
     if PY3:
-        test_support.run_unittest(
-            TestOldDict,
-            Py2DictTest,
-        )
-
-
-if __name__ == '__main__':
-    test_main()
+        unittest.main()