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

wcsftime() doesn't format time zone correctly.

diff --git a/Misc/NEWS b/Misc/NEWS
index 3c3bff826417232d1f157230dcad786402f02a61..44447bacac1238b204193effc453b2cb8eeee638 100644 (file)
--- 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 3af041a2b6f11a9785762e47493d922b2a25ee24..34e4875a29906d42b57731263246321d83ad9a61 100644 (file)
--- 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