Combine the functionality of test_support.run_unittest()
and test_support.run_classtests() into run_unittest()
and use it wherever possible.
Also don't use "from test.test_support import ...", but
"from test import test_support" in a few spots.
From SF patch #662807.
diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
index 2c3955b..140b226 100644
--- a/Lib/test/test_strptime.py
+++ b/Lib/test/test_strptime.py
@@ -406,14 +406,14 @@
"%s != %s" % (result.tm_wday, self.time_tuple.tm_wday))
def test_main():
- suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(LocaleTime_Tests))
- suite.addTest(unittest.makeSuite(TimeRETests))
- suite.addTest(unittest.makeSuite(StrptimeTests))
- suite.addTest(unittest.makeSuite(Strptime12AMPMTests))
- suite.addTest(unittest.makeSuite(JulianTests))
- suite.addTest(unittest.makeSuite(CalculationTests))
- test_support.run_suite(suite)
+ test_support.run_unittest(
+ LocaleTime_Tests,
+ TimeRETests,
+ StrptimeTests,
+ Strptime12AMPMTests,
+ JulianTests,
+ CalculationTests
+ )
if __name__ == '__main__':