mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
because wcsftime() doesn't format time zone correctly.
This commit is contained in:
Victor Stinner 2011-10-14 02:39:06 +02:00
commit 792b47f6ca
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

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

5
Modules/timemodule.c
View file

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