From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sat, 27 Mar 2010 13:45:04 +0000 (+0000)
Subject: Merged revisions 79468 via svnmerge from
X-Git-Tag: v3.2a1~1304
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf1fab4aa0b73376af66f3e42b4329d353c53629;p=thirdparty%2FPython%2Fcpython.git

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).
........
---

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 4016b7531a87..7059c431634c 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -4,9 +4,8 @@ from test import support
 
 
 def test_main():
-    support.run_unittest(unittest.test.test_suite())
+    support.run_unittest(unittest.test.suite())
     support.reap_children()
 
-
 if __name__ == "__main__":
     test_main()
diff --git a/Lib/unittest/test/__init__.py b/Lib/unittest/test/__init__.py
index c0548e93e51f..99b730b1546e 100644
--- a/Lib/unittest/test/__init__.py
+++ b/Lib/unittest/test/__init__.py
@@ -6,7 +6,7 @@ import unittest
 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 @@ def test_suite():
 
 
 if __name__ == "__main__":
-    unittest.main(defaultTest="test_suite")
+    unittest.main(defaultTest="suite")