merge 3.2

This commit is contained in:
Victor Stinner 2011-03-21 02:15:18 +01:00
commit 161fbeae72

View file

@ -476,9 +476,8 @@ time_strftime(PyObject *self, PyObject *args)
#if defined(_MSC_VER) || defined(sun) #if defined(_MSC_VER) || defined(sun)
if (buf.tm_year + 1900 < 1 || 9999 < buf.tm_year + 1900) { if (buf.tm_year + 1900 < 1 || 9999 < buf.tm_year + 1900) {
PyErr_Format(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"strftime() requires year in [1; 9999]", "strftime() requires year in [1; 9999]");
buf.tm_year + 1900);
return NULL; return NULL;
} }
#endif #endif