[Python-checkins] cpython (merge 3.2 -> default): merge 3.2
victor.stinner
python-checkins at python.org
Mon Mar 21 02:15:26 CET 2011
http://hg.python.org/cpython/rev/a6f3fa489f8d
changeset: 68784:a6f3fa489f8d
parent: 68782:cbd86ac6cc81
parent: 68783:be74f446b4b8
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Mon Mar 21 02:15:18 2011 +0100
summary:
merge 3.2
files:
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -476,9 +476,8 @@
#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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list