From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sat, 27 Mar 2010 13:42:34 +0000 (+0000)
Subject: Rename the unittest test_suite function to not clash with a test module name (unittes... 
X-Git-Tag: v2.7b1~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b35ecf47755b23be95657df7d80fe5fcfe261671;p=python

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 1e2b323a5f..86a998b6f4 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -4,7 +4,7 @@ from test import test_support
 
 
 def test_main():
-    test_support.run_unittest(unittest.test.test_suite())
+    test_support.run_unittest(unittest.test.suite())
     test_support.reap_children()
 
 
diff --git a/Lib/unittest/test/__init__.py b/Lib/unittest/test/__init__.py
index c0548e93e5..99b730b154 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")