From c1f32ca0ade3a1bc60c0ca18efa4756d3c5282f1 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 14 Oct 2011 02:36:13 +0200 Subject: Issue #10653: On Windows, use strftime() instead of wcsftime() because wcsftime() doesn't format time zone correctly. --- Misc/NEWS | 3 +++ Modules/timemodule.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 3c3bff8..44447ba 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -43,6 +43,9 @@ Core and Builtins Library ------- +- Issue #10653: On Windows, use strftime() instead of wcsftime() because + wcsftime() doesn't format time zone correctly. + - Issue #11171: Fix distutils.sysconfig.get_makefile_filename when Python was configured with different prefix and exec-prefix. 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 -- cgit v0.12