diff options
| -rw-r--r-- | Lib/test/test_strftime.py | 26 | ||||
| -rw-r--r-- | Modules/timemodule.c | 7 |
2 files changed, 33 insertions, 0 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index 6510c36..d3f80c6 100644 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -177,5 +177,31 @@ class StrftimeTest(unittest.TestCase): print(" Expected %s, but got %s" % (e[1], result)) +class Y1900Tests(unittest.TestCase): + """A limitation of the MS C runtime library is that it crashes if + a date before 1900 is passed with a format string containing "%y" + """ + + @unittest.skipUnless(sys.platform == "win32", "Only applies to Windows") + def test_y_before_1900_win(self): + with self.assertRaises(ValueError): + time.strftime("%y", (1899, 1, 1, 0, 0, 0, 0, 0, 0)) + + @unittest.skipIf(sys.platform == "win32", "Doesn't apply on Windows") + def test_y_before_1900_nonwin(self): + self.assertEquals( + time.strftime("%y", (1899, 1, 1, 0, 0, 0, 0, 0, 0)), "99") + + def test_y_1900(self): + self.assertEquals( + time.strftime("%y", (1900, 1, 1, 0, 0, 0, 0, 0, 0)), "00") + + def test_y_after_1900(self): + self.assertEquals( + time.strftime("%y", (2013, 1, 1, 0, 0, 0, 0, 0, 0)), "13") + +def test_main(): + support.run_unittest(StrftimeTest, Y1900Tests) + if __name__ == '__main__': unittest.main() diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 8d161d4..2e48007 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -642,6 +642,13 @@ time_strftime(PyObject *self, PyObject *args) Py_DECREF(format); return NULL; } + if ((outbuf[1] == 'y') && buf.tm_year < 0) + { + PyErr_SetString(PyExc_ValueError, + "format %y requires year >= 1900 on Windows"); + Py_DECREF(format); + return NULL; + } } #endif |