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

Victor Stinner · Victor Stinner · commit 792b47f6caba · 2011-10-14T02:39:06.000+02:00
because wcsftime() doesn't format time zone correctly.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -305,6 +305,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #10653: On Windows, use strftime() instead of wcsftime() because
+  wcsftime() doesn't format time zone correctly.
+
 - Issue #13150: The tokenize module doesn't compile large regular expressions
   at startup anymore.
 
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -386,6 +386,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
