summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-03-27 13:42:34 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-03-27 13:42:34 (GMT)
commitb35ecf47755b23be95657df7d80fe5fcfe261671 (patch)
treeabcd38d26192dcb64589e4e079fc2534e369cd46 /Lib/unittest
parentff889396a845a557aa440a6960fcc5d8e6d9033a (diff)
downloadcpython-b35ecf47755b23be95657df7d80fe5fcfe261671.zip
cpython-b35ecf47755b23be95657df7d80fe5fcfe261671.tar.gz
cpython-b35ecf47755b23be95657df7d80fe5fcfe261671.tar.bz2
Rename the unittest test_suite function to not clash with a test module name (unittest.test.test_suite is now unambiguous).
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/test/__init__.py4
1 files changed, 2 insertions, 2 deletions
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 @@ 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")