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

Fri Mar 1 09:56:56 CET 2013

http://hg.python.org/cpython/rev/e222f24837dd
changeset: 82432:e222f24837dd
parent: 82429:637c2cd716d1
parent: 82431:42d4a29509c4
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Mar 01 10:56:35 2013 +0200
summary:
 #17079: merge with 3.3.
files:
 Lib/test/test_ctypes.py | 8 ++++----
 Misc/NEWS | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_ctypes.py b/Lib/test/test_ctypes.py
--- a/Lib/test/test_ctypes.py
+++ b/Lib/test/test_ctypes.py
@@ -1,16 +1,16 @@
 import unittest
 
-from test.support import run_unittest, import_module
+from test.support import import_module
 
 # Skip tests if _ctypes module was not built.
 import_module('_ctypes')
 
 import ctypes.test
 
-def test_main():
+def load_tests(*args):
 skipped, testcases = ctypes.test.get_tests(ctypes.test, "test_*.py", verbosity=0)
 suites = [unittest.makeSuite(t) for t in testcases]
- run_unittest(unittest.TestSuite(suites))
+ return unittest.TestSuite(suites)
 
 if __name__ == "__main__":
- test_main()
+ unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -896,6 +896,9 @@
 
 - Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 
+- Issue #17079: test_ctypes now works with unittest test discovery.
+ Patch by Zachary Ware.
+
 - Issue #17304: test_hash now works with unittest test discovery.
 Patch by Zachary Ware.
 
-- 
Repository URL: http://hg.python.org/cpython
