commit b35ecf47755b23be95657df7d80fe5fcfe261671
author Michael Foord <fuzzyman@voidspace.org.uk> Sat Mar 27 13:42:34 2010 +0000
committer Michael Foord <fuzzyman@voidspace.org.uk> Sat Mar 27 13:42:34 2010 +0000
tree abcd38d26192dcb64589e4e079fc2534e369cd46
parent ff889396a845a557aa440a6960fcc5d8e6d9033a

Rename the unittest test_suite function to not clash with a test module name (unittest.test.test_suite is now unambiguous).

Lib/test/test_unittest.py

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 1e2b323..86a998b 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -4,7 +4,7 @@
 
 
 def test_main():
-    test_support.run_unittest(unittest.test.test_suite())
+    test_support.run_unittest(unittest.test.suite())
     test_support.reap_children()
 
 

Lib/unittest/test/__init__.py

diff --git a/Lib/unittest/test/__init__.py b/Lib/unittest/test/__init__.py
index c0548e9..99b730b 100644
--- a/Lib/unittest/test/__init__.py
+++ b/Lib/unittest/test/__init__.py
@@ -6,7 +6,7 @@
 here = os.path.dirname(__file__)
 loader = unittest.defaultTestLoader
 
-def test_suite():
+def suite():
     suite = unittest.TestSuite()
     for fn in os.listdir(here):
         if fn.startswith("test") and fn.endswith(".py"):
@@ -18,4 +18,4 @@
 
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    unittest.main(defaultTest="suite")