diff -r b79025925eab Lib/test/test_time.py --- a/Lib/test/test_time.py Wed Apr 03 13:49:36 2013 +0100 +++ b/Lib/test/test_time.py Wed Apr 10 13:55:37 2013 -0500 @@ -459,10 +459,6 @@ time.strftime("%B", (2009,2,1,0,0,0,0,0,0)) -class _BaseYearTest(unittest.TestCase): - def yearstr(self, y): - raise NotImplementedError() - class _TestAsctimeYear: _format = '%d' @@ -520,7 +516,7 @@ del skip_if_not_supported -class _Test4dYear(_BaseYearTest): +class _Test4dYear: _format = '%d' def test_year(self, fmt=None, func=None): @@ -553,10 +549,10 @@ self.assertRaises(OverflowError, self.yearstr, TIME_MINYEAR - 1) -class TestAsctime4dyear(_TestAsctimeYear, _Test4dYear): +class TestAsctime4dyear(_TestAsctimeYear, _Test4dYear, unittest.TestCase): pass -class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear): +class TestStrftime4dyear(_TestStrftimeYear, _Test4dYear, unittest.TestCase): pass @@ -673,13 +669,6 @@ self.assertIs(lt.tm_gmtoff, None) self.assertIs(lt.tm_zone, None) -def test_main(): - support.run_unittest( - TimeTestCase, - TestLocale, - TestAsctime4dyear, - TestStrftime4dyear, - TestPytime) if __name__ == "__main__": - test_main() + unittest.main()