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

because wcsftime() doesn't format time zone correctly.

(Merge 3.2) Issue #10653: On Windows, use strftime() instead of wcsftime()
because wcsftime() doesn't format time zone correctly.
792b47f6 · Victor Stinner · f5cff56a · c1f32ca0 · 792b47f6 · 792b47f6
Commit 792b47f6 authored 13 years ago 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
@@ -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.


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