diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 15:40:59 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2011-02-15 15:40:59 (GMT) |
| commit | 4fb96f41f4525c25dcba386db96e5298e563cf65 (patch) | |
| tree | d22aea3af41a09a568d84436d2d0255dfc0583ae /Modules/timemodule.c | |
| parent | 725cb96d8a37baefc6a5336c4c49d093549b4217 (diff) | |
| download | cpython-4fb96f41f4525c25dcba386db96e5298e563cf65.zip cpython-4fb96f41f4525c25dcba386db96e5298e563cf65.tar.gz cpython-4fb96f41f4525c25dcba386db96e5298e563cf65.tar.bz2 | |
Merged revisions 87919 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87919 | alexander.belopolsky | 2011-01-10 20:21:25 -0500 (Mon, 10 Jan 2011) | 4 lines
Issue #1726687: time.mktime() will now correctly compute value one
second before epoch. Original patch by Peter Wang, reported by Martin
Blais.
........
Diffstat (limited to 'Modules/timemodule.c')
| -rw-r--r-- | Modules/timemodule.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 29b4eea..8c40d21 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -703,8 +703,11 @@ time_mktime(PyObject *self, PyObject *tup) time_t tt; if (!gettmarg(tup, &buf)) return NULL; + buf.tm_wday = -1; /* sentinel; original value ignored */ tt = mktime(&buf); - if (tt == (time_t)(-1)) { + /* Return value of -1 does not necessarily mean an error, but tm_wday + * cannot remain set to -1 if mktime succedded. */ + if (tt == (time_t)(-1) && buf.tm_wday == -1) { PyErr_SetString(PyExc_OverflowError, "mktime argument out of range"); return NULL; |