Skip to content

C
cpython
Commit 792b47f6 authored by Victor Stinner's avatar Victor Stinner
Browse files
Options

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

because wcsftime() doesn't format time zone correctly.
parents f5cff56a c1f32ca0
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
Misc/NEWS
View file @ 792b47f6
...@@ -305,6 +305,9 @@ Core and Builtins ...@@ -305,6 +305,9 @@ Core and Builtins
Library 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 - Issue #13150: The tokenize module doesn't compile large regular expressions
at startup anymore. at startup anymore.
......
Modules/timemodule.c
View file @ 792b47f6
...@@ -386,6 +386,11 @@ checktm(struct tm* buf) ...@@ -386,6 +386,11 @@ checktm(struct tm* buf)
return 1; return 1;
} }
#ifdef MS_WINDOWS
/* wcsftime() doesn't format correctly time zones, see issue #10653 */
# undef HAVE_WCSFTIME
#endif
#ifdef HAVE_STRFTIME #ifdef HAVE_STRFTIME
#ifdef HAVE_WCSFTIME #ifdef HAVE_WCSFTIME
#define time_char wchar_t #define time_char wchar_t
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7