diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-14 00:39:06 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-10-14 00:39:06 (GMT) |
| commit | 792b47f6caba35c996db8361d06a0368eb58bea0 (patch) | |
| tree | 6829326e25b21278e5f85a1ee2d56c3f9e126548 /Modules/timemodule.c | |
| parent | f5cff56a1be70d2c4e5cde5fa4e5d5d92e620dda (diff) | |
| parent | c1f32ca0ade3a1bc60c0ca18efa4756d3c5282f1 (diff) | |
| download | cpython-792b47f6caba35c996db8361d06a0368eb58bea0.zip cpython-792b47f6caba35c996db8361d06a0368eb58bea0.tar.gz cpython-792b47f6caba35c996db8361d06a0368eb58bea0.tar.bz2 | |
(Merge 3.2) Issue #10653: On Windows, use strftime() instead of wcsftime()
because wcsftime() doesn't format time zone correctly.
Diffstat (limited to 'Modules/timemodule.c')
| -rw-r--r-- | Modules/timemodule.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 2ea0247..24066d8 100644 --- 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 |