Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 4 commits into from
Oct 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
629ff02
gh-52551: Use wcsftime() to implement time.strftime() on Windows
serhiy-storchaka Oct 17, 2024
0c0f987
Fix test.
serhiy-storchaka Oct 17, 2024
16782e9
HAVE_WCSFTIME is already defined.
serhiy-storchaka Oct 18, 2024
0e1bdf7
Merge branch 'main' into strftime-windows-wcsftime
serhiy-storchaka Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Lib/test/test_strftime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-10-17-20-36-06.gh-issue-52551.EIVNYY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use :c:func:`!wcsftime` to implement :func:`time.strftime` on Windows.
3 changes: 1 addition & 2 deletions Modules/timemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,8 +740,7 @@ checktm(struct tm* buf)
}

#ifdef MS_WINDOWS
/* wcsftime() doesn't format correctly time zones, see issue #10653 */
# undef HAVE_WCSFTIME
# define HAVE_WCSFTIME

@vstinner vstinner Oct 18, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are compiler warnings: 'HAVE_WCSFTIME': macro redefinition [D:\a\cpython\cpython\PCbuild_freeze_module.vcxproj]

@serhiy-storchaka serhiy-storchaka Oct 18, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I did not find where it was defined in C.

#endif
#define STRFTIME_FORMAT_CODES \
"Commonly used format codes:\n\
Expand Down