[Python-checkins] cpython (merge 3.2 -> default): (Merge 3.2) Issue #10653: On Windows, use strftime() instead of wcsftime()

[victor.stinner]

http://hg.python.org/cpython/rev/79e60977fc04
changeset:   72920:79e60977fc04
parent:      72918:d76338eacf7c
parent:      72919:e3d9c5e690fc
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Fri Oct 14 02:39:06 2011 +0200
summary:
  (Merge 3.2) Issue #10653: On Windows, use strftime() instead of wcsftime()
because wcsftime() doesn't format time zone correctly.

files:
  Misc/NEWS            |  3 +++
  Modules/timemodule.c |  5 +++++
  2 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 --git a/Modules/timemodule.c b/Modules/timemodule.c
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -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

-- 
Repository URL: http://hg.python.org/cpython