commit 8009e8e0e2d9120d2d386bf00d3c02f2e92faf83
author Alexander Belopolsky <alexander.belopolsky@gmail.com> Sun Jan 02 23:23:54 2011 +0000
committer Alexander Belopolsky <alexander.belopolsky@gmail.com> Sun Jan 02 23:23:54 2011 +0000
tree 824a2487f0d20ab33014e9c34b3793fbbe409369
parent 9e7d6e598c4eebf6f6726057f5a819518e17f1b6

Merged revisions 87648,87656 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87648 | alexander.belopolsky | 2011-01-02 15:48:22 -0500 (Sun, 02 Jan 2011) | 1 line

  Issue #8013: Fixed time.asctime segfault when OS's asctime fails
........
  r87656 | alexander.belopolsky | 2011-01-02 17:16:10 -0500 (Sun, 02 Jan 2011) | 1 line

  Issue #8013: Fixed test
........

Lib/test/test_time.py

diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index c991b50..0028f15 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -114,6 +114,16 @@
     def test_asctime(self):
         time.asctime(time.gmtime(self.t))
         self.assertRaises(TypeError, time.asctime, 0)
+        self.assertRaises(TypeError, time.asctime, ())
+        # XXX: Posix compiant asctime should refuse to convert
+        # year > 9999, but Linux implementation does not.
+        # self.assertRaises(ValueError, time.asctime,
+        #                  (12345, 1, 0, 0, 0, 0, 0, 0, 0))
+        # XXX: For now, just make sure we don't have a crash:
+        try:
+            time.asctime((12345, 1, 0, 0, 0, 0, 0, 0, 0))
+        except ValueError:
+            pass
 
     @unittest.skipIf(not hasattr(time, "tzset"),
         "time module has no attribute tzset")