[Python-checkins] cpython (merge 3.3 -> default): #17479: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/99a81681237d
changeset:   82904:99a81681237d
parent:      82902:4682d18e8143
parent:      82903:fa9e189e30ad
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Mar 23 16:36:58 2013 +0200
summary:
  #17479: merge with 3.3.

files:
  Lib/test/test_io.py |  7 ++++---
  Misc/NEWS           |  3 +++
  2 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3234,7 +3234,7 @@
     test_reentrant_write_text = None
 
 
-def test_main():
+def load_tests(*args):
     tests = (CIOTest, PyIOTest,
              CBufferedReaderTest, PyBufferedReaderTest,
              CBufferedWriterTest, PyBufferedWriterTest,
@@ -3267,7 +3267,8 @@
             for name, obj in py_io_ns.items():
                 setattr(test, name, obj)
 
-    support.run_unittest(*tests)
+    suite = unittest.TestSuite([unittest.makeSuite(test) for test in tests])
+    return suite
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1035,6 +1035,9 @@
 
 - Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 
+- Issue #17479: test_io now works with unittest test discovery.
+  Patch by Zachary Ware.
+
 - Issue #17066: test_robotparser now works with unittest test discovery.
   Patch by Zachary Ware.
 

-- 
Repository URL: http://hg.python.org/cpython