merge 3.2

161fbeae · Victor Stinner · ee525de6 · 6f0e4f99 · 161fbeae
Commit 161fbeae authored Mar 21, 2011 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

Modules/timemodule.c Modules/timemodule.c +2 -3

No files found.
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -476,9 +476,8 @@ time_strftime(PyObject *self, PyObject *args)

 #if defined(_MSC_VER) || defined(sun)
    if (buf.tm_year + 1900 < 1 || 9999 < buf.tm_year + 1900) {
-        PyErr_Format(PyExc_ValueError,
-                     "strftime() requires year in [1; 9999]",
-                     buf.tm_year + 1900);
+        PyErr_SetString(PyExc_ValueError,
+                        "strftime() requires year in [1; 9999]");
        return NULL;
    }
 #endif