Skip to content
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

gh-122272: guarantee specifiers %F and %C for datetime.strftime to be 0-padded #122436

Merged
merged 11 commits into from
Aug 23, 2024
Merged

gh-122272: guarantee specifiers %F and %C for datetime.strftime to be 0-padded #122436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
61c2c61
gh-122272: guarantee specifiers %F and %C for datetime.strftime to be…
blhsing Jul 30, 2024
8dc1100
removed trailing spaces
blhsing Jul 30, 2024
f85cd69
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 30, 2024
2fd7093
handle %C and %F only when the C library supports them (at least C99)
blhsing Jul 30, 2024
8fe9521
use autoconf instead to test if c99-specific specifiers are supported
blhsing Jul 30, 2024
4e1ea89
generate header
blhsing Jul 30, 2024
bfd2f18
corrected logics of checks for c99 support
blhsing Jul 30, 2024
fd8dd30
allocate 6 more bytes for the formatted date buffer only when %F is s…
blhsing Jul 31, 2024
3e36832
pass through month and day to time.strftime for %F; made _supports_c9…
blhsing Aug 16, 2024
3530288
validate timetuple as a tuple; cache result of _can_support_c99 upon …
blhsing Aug 22, 2024
c9c51d7
use PySequence_GetItem instead of PyTuple_GetItem for better error ha…
blhsing Aug 23, 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
2 changes: 1 addition & 1 deletion Lib/_pydatetime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def _can_support_c99():
_supports_c99 = (
_time.strftime("%F", (1900, 1, 1, 0, 0, 0, 0, 1, 0)) == "1900-01-01")
except ValueError:
pass
return False
blhsing marked this conversation as resolved.
Show resolved Hide resolved
return _supports_c99

# Correctly substitute for %z and %Z escapes in strftime formats.
Expand Down
30 changes: 9 additions & 21 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,9 +1961,11 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
#endif
) {
/* 0-pad year with century as necessary */
PyObject *item = PyTuple_GET_ITEM(timetuple, 0);
PyObject *item = PyTuple_GetItem(timetuple, 0);
blhsing marked this conversation as resolved.
Show resolved Hide resolved
if (item == NULL) {
goto Done;
}
long year_long = PyLong_AsLong(item);

if (year_long == -1 && PyErr_Occurred()) {
goto Done;
}
Expand All @@ -1989,28 +1991,14 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
goto Done;
}
}
ntoappend = PyOS_snprintf(buf, sizeof(buf),
#ifdef Py_STRFTIME_C99_SUPPORT
if (ch == 'F') {
item = PyTuple_GET_ITEM(timetuple, 1);
long month = PyLong_AsLong(item);
if (month == -1 && PyErr_Occurred()) {
goto Done;
}
item = PyTuple_GET_ITEM(timetuple, 2);
long day = PyLong_AsLong(item);
if (day == -1 && PyErr_Occurred()) {
goto Done;
}
ntoappend = PyOS_snprintf(buf, sizeof(buf), "%04ld-%02ld-%02ld",
year_long, month, day);
}
else {
ch == 'F' ? "%04ld-%%m-%%d" :
#endif
ntoappend = PyOS_snprintf(buf, sizeof(buf), "%04ld", year_long);
"%04ld", year_long);
#ifdef Py_STRFTIME_C99_SUPPORT
if (ch == 'C') {
ntoappend -= 2;
}
if (ch == 'C') {
ntoappend -= 2;
}
#endif
ptoappend = buf;
Expand Down
Loading