Issue #10653: On Windows, use strftime() instead of wcsftime() because

wcsftime() doesn't format time zone correctly.
2011-10-14 02:36:13 +02:00 · 2011-10-14 02:36:13 +02:00 · c1f32ca0ad
parent d41a98bdd9
commit c1f32ca0ad
2 changed files with 8 additions and 0 deletions
--- 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.

--- 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