summaryrefslogtreecommitdiffstats
path: root/Modules/timemodule.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-10-14 00:36:13 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-10-14 00:36:13 (GMT)
commitc1f32ca0ade3a1bc60c0ca18efa4756d3c5282f1 (patch)
tree1c74f247d04636a22421c20b4a6976b450659e70 /Modules/timemodule.c
parentd41a98bdd9076eeadf4d3ba6d8db287e26b89777 (diff)
downloadcpython-c1f32ca0ade3a1bc60c0ca18efa4756d3c5282f1.zip
cpython-c1f32ca0ade3a1bc60c0ca18efa4756d3c5282f1.tar.gz
cpython-c1f32ca0ade3a1bc60c0ca18efa4756d3c5282f1.tar.bz2
Issue #10653: On Windows, use strftime() instead of wcsftime() because
wcsftime() doesn't format time zone correctly.
Diffstat (limited to 'Modules/timemodule.c')
-rw-r--r--Modules/timemodule.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 3af041a..34e4875 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -431,6 +431,11 @@ checktm(struct tm* buf)
return 1;
}
+#ifdef MS_WINDOWS
+ /* wcsftime() doesn't format correctly time zones, see issue #10653 */
+# undef HAVE_WCSFTIME
+#endif
+
#ifdef HAVE_STRFTIME
#ifdef HAVE_WCSFTIME
#define time_char wchar_t