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

wcsftime() doesn't format time zone correctly.

Issue #10653: On Windows, use strftime() instead of wcsftime() because
wcsftime() doesn't format time zone correctly.
c1f32ca0 · Victor Stinner · d41a98bd · c1f32ca0 · c1f32ca0
Commit c1f32ca0 authored Oct 14, 2011 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

Misc/NEWS Misc/NEWS +3 -0

Modules/timemodule.c Modules/timemodule.c +5 -0

No files found.
--- 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.


--- 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