diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2024-10-19 08:29:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 08:29:51 (GMT) |
| commit | a7443a1735c33d5758b47ac9b8a1c34bac4ef994 (patch) | |
| tree | fe81ac4612c1fbd11cfec55ead5167c93cb4cd72 | |
| parent | 84074a4fd810948350cec5500e77dc974cb5433d (diff) | |
| download | cpython-a7443a1735c33d5758b47ac9b8a1c34bac4ef994.zip cpython-a7443a1735c33d5758b47ac9b8a1c34bac4ef994.tar.gz cpython-a7443a1735c33d5758b47ac9b8a1c34bac4ef994.tar.bz2 | |
gh-52551: Use wcsftime() to implement time.strftime() on Windows (GH-125658)
| -rw-r--r-- | Lib/test/test_strftime.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2024-10-17-20-36-06.gh-issue-52551.EIVNYY.rst | 1 | ||||
| -rw-r--r-- | Modules/timemodule.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index cebfc89..752e313 100644 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -183,8 +183,7 @@ class Y1900Tests(unittest.TestCase): def test_y_before_1900(self): # Issue #13674, #19634 t = (1899, 1, 1, 0, 0, 0, 0, 0, 0) - if (sys.platform == "win32" - or sys.platform.startswith(("aix", "sunos", "solaris"))): + if sys.platform.startswith(("aix", "sunos", "solaris")): with self.assertRaises(ValueError): time.strftime("%y", t) else: diff --git a/Misc/NEWS.d/next/Library/2024-10-17-20-36-06.gh-issue-52551.EIVNYY.rst b/Misc/NEWS.d/next/Library/2024-10-17-20-36-06.gh-issue-52551.EIVNYY.rst new file mode 100644 index 0000000..48d3d93 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-10-17-20-36-06.gh-issue-52551.EIVNYY.rst @@ -0,0 +1 @@ +Use :c:func:`!wcsftime` to implement :func:`time.strftime` on Windows. diff --git a/Modules/timemodule.c b/Modules/timemodule.c index b9d114a..340011f 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -739,10 +739,6 @@ checktm(struct tm* buf) return 1; } -#ifdef MS_WINDOWS - /* wcsftime() doesn't format correctly time zones, see issue #10653 */ -# undef HAVE_WCSFTIME -#endif #define STRFTIME_FORMAT_CODES \ "Commonly used format codes:\n\ \n\ |