Merged revisions 87663 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r87663 | alexander.belopolsky | 2011-01-02 18:23:54 -0500 (Sun, 02 Jan 2011) | 13 lines 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 ........ ................
This commit is contained in:
parent
893c354a55
commit
41769a7513
|
@ -119,6 +119,16 @@ class TimeTestCase(unittest.TestCase):
|
|||
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
|
||||
|
||||
def test_tzset(self):
|
||||
if not hasattr(time, "tzset"):
|
||||
|
|
|
@ -546,6 +546,10 @@ time_asctime(PyObject *self, PyObject *args)
|
|||
} else if (!gettmarg(tup, &buf))
|
||||
return NULL;
|
||||
p = asctime(&buf);
|
||||
if (p == NULL) {
|
||||
PyErr_SetString(PyExc_ValueError, "invalid time");
|
||||
return NULL;
|
||||
}
|
||||
if (p[24] == '\n')
|
||||
p[24] = '\0';
|
||||
return PyString_FromString(p);
|
||||
|
|
Loading…
Reference in New Issue