changeset:   72920:79e60977fc04
parent:      72918:d76338eacf7c
parent:      72919:e3d9c5e690fc
user:        Victor Stinner <victor.stinner@haypocalc.com>
date:        Fri Oct 14 02:39:06 2011 +0200
files:       Misc/NEWS Modules/timemodule.c
description:
(Merge 3.2) Issue #10653: On Windows, use strftime() instead of wcsftime()
because wcsftime() doesn't format time zone correctly.


diff -r d76338eacf7c -r 79e60977fc04 Misc/NEWS
--- a/Misc/NEWS	Fri Oct 14 02:13:11 2011 +0200
+++ b/Misc/NEWS	Fri Oct 14 02:39:06 2011 +0200
@@ -305,6 +305,9 @@
 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 -r d76338eacf7c -r 79e60977fc04 Modules/timemodule.c
--- a/Modules/timemodule.c	Fri Oct 14 02:13:11 2011 +0200
+++ b/Modules/timemodule.c	Fri Oct 14 02:39:06 2011 +0200
@@ -386,6 +386,11 @@
     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