From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 19 Oct 2024 08:29:51 +0000 (+0300)
Subject: gh-52551: Use wcsftime() to implement time.strftime() on Windows (GH-125658)
X-Git-Tag: v3.14.0a2~365
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7443a1735c33d5758b47ac9b8a1c34bac4ef994;p=thirdparty%2FPython%2Fcpython.git

gh-52551: Use wcsftime() to implement time.strftime() on Windows (GH-125658)
---

diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index cebfc8927862..752e31359cf2 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 000000000000..48d3d93c3d72
--- /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 b9d114ada0df..340011fc08b5 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\