Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-137165: Standardized non-zero-padded date formatting for datetime.strftime #139088

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

Open
F0RRZZ wants to merge 17 commits into
base: main
Choose a base branch
from
Open

gh-137165: Standardized non-zero-padded date formatting for datetime.strftime #139088

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2f6c0ce
gh-137165: Add non-zero-padded Windows support for datetime.strftime
Sep 16, 2025
8d16901
Refactor make_dash_replacement func and add negative test
Sep 18, 2025
11e0218
Fix tests for IOS and add docs
Sep 18, 2025
eb5c883
Update docs and news entry
Sep 18, 2025
224654c
Fix 0 seconds/minutes strip and update docs
Sep 18, 2025
551f16e
Update news entry
Sep 18, 2025
ddc75ed
Unify strftime/ptime notes and refactor code
Sep 19, 2025
a51dad6
Update notes numbers
Sep 19, 2025
0e5ef8b
Update datetime.rst
Sep 19, 2025
375cf41
Fix refleaks and tests for FreeBSD
Sep 23, 2025
40d0e1c
Fix refleaks
Sep 24, 2025
2054356
Fix linting
Sep 24, 2025
6ff5f4f
Refactor wrap_strftime func
Sep 25, 2025
d5f2014
Make replacement less complex
Sep 26, 2025
0d53ced
Remove useless variable
Sep 26, 2025
9212a5a
Docs formatting and code style
Oct 1, 2025
2373670
Merge branch 'main' into issue-137165
Nov 5, 2025
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
Prev Previous commit
Next Next commit
Make replacement less complex
  • Loading branch information
marat committed Sep 26, 2025
commit d5f2014681d7d9d8eb2a692388ba9993d043e2a3
20 changes: 6 additions & 14 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1921,6 +1921,7 @@
PyObject *colonzreplacement = NULL; /* py string, replacement for %:z */
PyObject *Zreplacement = NULL; /* py string, replacement for %Z */
PyObject *freplacement = NULL; /* py string, replacement for %f */
PyObject *dash_replacement = NULL; /* py string, replacement for %- */

assert(object && format && timetuple);
assert(PyUnicode_Check(format));
Expand Down Expand Up @@ -1959,7 +1960,7 @@
i++;
/* A % has been seen and ch is the character after it. */
PyObject *replacement = NULL;
int need_decref_replacement = 0;

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Cross build Linux 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Cross build Linux 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Check warning on line 1963 in Modules/_datetimemodule.c

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

unused variable ‘need_decref_replacement’ [-Wunused-variable]

Comment thread
mhsmith marked this conversation as resolved.
Outdated
if (ch == 'z') {
/* %z -> +HHMM */
Expand Down Expand Up @@ -2058,13 +2059,12 @@
Py_UCS4 next_ch = PyUnicode_READ_CHAR(format, i);
i++;

PyObject *tmp = make_dash_replacement(object, next_ch, timetuple);
if (tmp == NULL) {
Py_XDECREF(dash_replacement);
dash_replacement = make_dash_replacement(object, next_ch, timetuple);
if (dash_replacement == NULL) {
goto Error;
}

replacement = tmp;
need_decref_replacement = 1;
replacement = dash_replacement;
}
#endif
else {
Expand All @@ -2074,21 +2074,12 @@
assert(replacement != NULL);
assert(PyUnicode_Check(replacement));
if (PyUnicodeWriter_WriteSubstring(writer, format, start, end) < 0) {
if (need_decref_replacement) {
Py_DECREF(replacement);
}
goto Error;
}
start = i;
if (PyUnicodeWriter_WriteStr(writer, replacement) < 0) {
if (need_decref_replacement) {
Py_DECREF(replacement);
}
goto Error;
}
if (need_decref_replacement) {
Py_DECREF(replacement);
}
} /* end while() */

PyObject *newformat;
Expand All @@ -2115,6 +2106,7 @@
Py_XDECREF(colonzreplacement);
Py_XDECREF(Zreplacement);
Py_XDECREF(strftime);
Py_XDECREF(dash_replacement);
Comment thread
mhsmith marked this conversation as resolved.
return result;

Error:
Expand Down
Loading