diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
commit | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (patch) | |
tree | dd97578d333a72ac825c0e7ad64e4367d8dfe248 /Modules/timemodule.c | |
parent | cc4a4842643d6415ca4a449e9d0557cfb029715a (diff) | |
parent | 13925008dc11f2a235627dc8c0440c0ce99171d9 (diff) | |
download | cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.zip cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.gz cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.bz2 |
#11565: Merge with 3.1.
Diffstat (limited to 'Modules/timemodule.c')
-rw-r--r-- | Modules/timemodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 3a12522..86b73a5 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -697,7 +697,7 @@ time_mktime(PyObject *self, PyObject *tup) buf.tm_wday = -1; /* sentinel; original value ignored */ tt = mktime(&buf); /* Return value of -1 does not necessarily mean an error, but tm_wday - * cannot remain set to -1 if mktime succedded. */ + * cannot remain set to -1 if mktime succeeded. */ if (tt == (time_t)(-1) && buf.tm_wday == -1) { PyErr_SetString(PyExc_OverflowError, "mktime argument out of range"); |