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


diff -r d18c80a8c119 -r e3d9c5e690fc Misc/NEWS
--- a/Misc/NEWS	Thu Oct 13 13:34:16 2011 +0200
+++ b/Misc/NEWS	Fri Oct 14 02:36:13 2011 +0200
@@ -43,6 +43,9 @@
 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 -r d18c80a8c119 -r e3d9c5e690fc Modules/timemodule.c
--- a/Modules/timemodule.c	Thu Oct 13 13:34:16 2011 +0200
+++ b/Modules/timemodule.c	Fri Oct 14 02:36:13 2011 +0200
@@ -431,6 +431,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