commit bf1fab4aa0b73376af66f3e42b4329d353c53629
author Michael Foord <fuzzyman@voidspace.org.uk> Sat Mar 27 13:45:04 2010 +0000
committer Michael Foord <fuzzyman@voidspace.org.uk> Sat Mar 27 13:45:04 2010 +0000
tree 2447d4f8fc497dc0353a165476d588c175cd678e
parent ff5366d2be826272ae435a787f4782b78f35fd42

Merged revisions 79468 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79468 | michael.foord | 2010-03-27 13:42:34 +0000 (Sat, 27 Mar 2010) | 1 line

  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 4016b75..7059c43 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -4,9 +4,8 @@
 
 
 def test_main():
-    support.run_unittest(unittest.test.test_suite())
+    support.run_unittest(unittest.test.suite())
     support.reap_children()
 
-
 if __name__ == "__main__":
     test_main()