iframe-proxy

blhsing · 2024-06-21T06:35:22Z

On some platforms such as Linux, datetime.strftime does not 0-pad a year <= 999 when formatting with '%Y' despite the documentation claiming an example output of "0001, 0002, …". The same issue applies when formatting with "%G".

This PR fixes the issue by formatting a year with century with '%04ld' using sprintf (in C) or '{:04}' using str.format (in Python) if the platform is found to show the aforementioned behavior.

reverted unit test

…acing the specifier with "%4Y"

…nt conversion

…ation

serhiy-storchaka

Note that %G also needs a fix.

… to maximum of long

blhsing · 2024-06-25T04:20:02Z

…8601 year

serhiy-storchaka

Thank you for addressing my comments.

I think that this is the right way to fix this problem, but we should still get confirmation from other core developers.

The code is much more complicated now with the support of "%G", and the C code has some bugs.

…ze of buffer

blhsing · 2024-06-29T01:03:36Z

Thanks for enduring my nitpicking, and thanks for the PR :)

Thank you so much for taking the time to point me in the right direction!

…oappend pointer

miss-islington-app · 2024-06-29T06:32:45Z

Thanks @blhsing for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

…ythonGH-120820) (cherry picked from commit 6d34938) Co-authored-by: blhsing <blhsing@gmail.com>

miss-islington-app · 2024-06-29T06:32:55Z

Sorry, @blhsing and @serhiy-storchaka, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 6d34938dc8163f4a4bcc68069a1645a7ab76e935 3.12

bedevere-app · 2024-06-29T06:32:57Z

GH-121144 is a backport of this pull request to the 3.13 branch.

serhiy-storchaka · 2024-06-29T06:36:33Z

Thank you for your work and patience @blhsing. My apologies for our too picky reviews.

…time (pythonGH-120820) (cherry picked from commit 6d34938) Co-authored-by: blhsing <blhsing@gmail.com>

bedevere-app · 2024-06-29T06:38:36Z

GH-121145 is a backport of this pull request to the 3.12 branch.

…H-120820) (GH-121145) (cherry picked from commit 6d34938) Co-authored-by: blhsing <blhsing@gmail.com>

…H-120820) (GH-121144) (cherry picked from commit 6d34938) Co-authored-by: blhsing <blhsing@gmail.com>

…ythonGH-120820)

…ime.strftime (pythonGH-120820) (pythonGH-121144)" This reverts commit 009618f.

…ime.strftime (pythonGH-120820) (pythonGH-121145)" This reverts commit 027902b.

…rftime (GH-120820) (GH-121145)" (GH-122409) This reverts commit 027902b.

…rftime (GH-120820) (GH-121144)" (GH-122408) This reverts commit 009618f.

bedevere-bot · 2024-07-29T19:30:30Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 Ubuntu NoGIL Refleaks 3.13 has failed when building commit 9f6f879.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/#builders/1431/builds/335) and take a look at the build logs.
Check if the failure is related to this commit (9f6f879) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#builders/1431/builds/335

Failed tests:

test_pickle

Test leaking resources:

test_pickle: memory blocks
test_pickle: references

Summary of the results of the build (if available):

==

Click to see traceback logs

remote: Enumerating objects: 10, done.        
remote: Counting objects:  10% (1/10)        
remote: Counting objects:  20% (2/10)        
remote: Counting objects:  30% (3/10)        
remote: Counting objects:  40% (4/10)        
remote: Counting objects:  50% (5/10)        
remote: Counting objects:  60% (6/10)        
remote: Counting objects:  70% (7/10)        
remote: Counting objects:  80% (8/10)        
remote: Counting objects:  90% (9/10)        
remote: Counting objects: 100% (10/10)        
remote: Counting objects: 100% (10/10), done.        
remote: Compressing objects:  12% (1/8)        
remote: Compressing objects:  25% (2/8)        
remote: Compressing objects:  37% (3/8)        
remote: Compressing objects:  50% (4/8)        
remote: Compressing objects:  62% (5/8)        
remote: Compressing objects:  75% (6/8)        
remote: Compressing objects:  87% (7/8)        
remote: Compressing objects: 100% (8/8)        
remote: Compressing objects: 100% (8/8), done.        
remote: Total 10 (delta 2), reused 5 (delta 2), pack-reused 0        
From https://github.com/python/cpython
 * branch                  3.13       -> FETCH_HEAD
Note: switching to '9f6f8790ef39fd035f6ada1a9dfcb47d58d08fea'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 9f6f8790ef Revert "[3.13] gh-120713: Normalize year with century for datetime.strftime (GH-120820) (GH-121144)" (GH-122408)
Switched to and reset branch '3.13'

configure: WARNING: no system libmpdecimal found; falling back to bundled libmpdecimal (deprecated and scheduled for removal in Python 3.15)

make: *** [Makefile:2264: buildbottest] Error 2

pythongh-120713: normalize year with century for datetime.strftime

9022177

blhsing requested review from abalkin, corona10, erlend-aasland and pganssle as code owners June 21, 2024 06:35

bedevere-app Bot mentioned this pull request Jun 21, 2024

datetime.strftime("%Y") is not padding correctly #120713

Closed

bedevere-app Bot added the awaiting review label Jun 21, 2024

blurb-it Bot and others added 14 commits June 21, 2024 06:37

📜🤖 Added by blurb_it.

a1592e3

pythongh-120713: fixed pyconfig.h.in

48affbd

Update 2024-06-21-06-37-46.gh-issue-120713.WBbQx4.rst

2ff6c0b

Update datetimetester.py

ab39dd9

reverted unit test

Update datetimetester.py

b905a4e

Update _pydatetime.py

b43858e

pythongh-120713: format "%Y" with "%4d" using sprintf instead of repl…

6ca887e

…acing the specifier with "%4Y"

pythongh-120713: test that a 0-padded year with century is guaranteed

a9623c4

pythongh-120713: revised detection logics in Python

2fc1c6a

pythongh-120713: fixed test

2c3252f

pythongh-120713: use "%04ld" instead of "%04d" to avoid unnecessary i…

9fd3d2d

…nt conversion

pythongh-120713: fixed scope for formatted year buffer

e64780b

pythongh-120713: added #ifdef guard over formatted year buffer declar…

32026be

…ation

pythongh-120713: fixed typo

fed7657

serhiy-storchaka reviewed Jun 24, 2024

View reviewed changes

Comment thread Modules/_datetimemodule.c Outdated

blhsing added 2 commits June 25, 2024 04:12

pythongh-120713: account for "%G"; increase buffer for formatted year…

7560a60

… to maximum of long

pythongh-120713: be pessimistic when cross-compiling

f5508ee

blhsing added 4 commits June 25, 2024 06:05

pythongh-120713: call time.strftime instead to obtain the proper ISO-…

abc3d21

…8601 year

pythongh-120713: align comment

ff7de92

pythongh-120713: additional comment and formatting

9c9e645

pythongh-120713: fixed comment

0f8886d

serhiy-storchaka reviewed Jun 25, 2024

View reviewed changes

Comment thread Modules/_datetimemodule.c Outdated

Comment thread Modules/_datetimemodule.c Outdated

Comment thread Modules/_datetimemodule.c Outdated

Comment thread Modules/_datetimemodule.c Outdated

pythongh-120713: use sizeof instead of a variable to determine the si…

e603132

…ze of buffer

blhsing added 3 commits June 29, 2024 01:23

pythongh-120713: use macro instead of sizeof

c54739b

pythongh-120713: moved buffer declaration to the same scope as the pt…

881dc1d

…oappend pointer

pythongh-120713: fixed typo

0cd5e27

serhiy-storchaka merged commit 6d34938 into python:main Jun 29, 2024

bedevere-app Bot removed the awaiting merge label Jun 29, 2024

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 29, 2024

pythongh-120713: Normalize year with century for datetime.strftime (p…

c697743

…ythonGH-120820) (cherry picked from commit 6d34938) Co-authored-by: blhsing <blhsing@gmail.com>

miss-islington-app Bot assigned serhiy-storchaka Jun 29, 2024

bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Jun 29, 2024

bedevere-app Bot removed the needs backport to 3.12 only security fixes label Jun 29, 2024

serhiy-storchaka added a commit that referenced this pull request Jun 29, 2024

[3.12] gh-120713: Normalize year with century for datetime.strftime (G…

027902b

…H-120820) (GH-121145) (cherry picked from commit 6d34938) Co-authored-by: blhsing <blhsing@gmail.com>

serhiy-storchaka pushed a commit that referenced this pull request Jun 29, 2024

[3.13] gh-120713: Normalize year with century for datetime.strftime (G…

009618f

…H-120820) (GH-121144) (cherry picked from commit 6d34938) Co-authored-by: blhsing <blhsing@gmail.com>

mrahtz pushed a commit to mrahtz/cpython that referenced this pull request Jun 30, 2024

pythongh-120713: Normalize year with century for datetime.strftime (p…

ae09fa4

…ythonGH-120820)

noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024

pythongh-120713: Normalize year with century for datetime.strftime (p…

708fb11

…ythonGH-120820)

blhsing mentioned this pull request Jul 15, 2024

datetime.strftime("%Y") not consistent for years < 1000 #57514

Closed

estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024

pythongh-120713: Normalize year with century for datetime.strftime (p…

a7773c9

…ythonGH-120820)

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Jul 29, 2024

Revert "[3.13] pythongh-120713: Normalize year with century for datet…

a705c85

…ime.strftime (pythonGH-120820) (pythonGH-121144)" This reverts commit 009618f.

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Jul 29, 2024

Revert "[3.12] pythongh-120713: Normalize year with century for datet…

533fc42

…ime.strftime (pythonGH-120820) (pythonGH-121145)" This reverts commit 027902b.

serhiy-storchaka added a commit that referenced this pull request Jul 29, 2024

Revert "[3.12] gh-120713: Normalize year with century for datetime.st…

e6878fc

…rftime (GH-120820) (GH-121145)" (GH-122409) This reverts commit 027902b.

serhiy-storchaka added a commit that referenced this pull request Jul 29, 2024

Revert "[3.13] gh-120713: Normalize year with century for datetime.st…

9f6f879

…rftime (GH-120820) (GH-121144)" (GH-122408) This reverts commit 009618f.

serhiy-storchaka mentioned this pull request Oct 17, 2024

gh-52551: Fix encoding issues in strftime() #125193

Merged

serhiy-storchaka removed their assignment Jul 15, 2026

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

Uh oh!

Conversation

blhsing commented Jun 21, 2024 • edited by jaraco Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

blhsing commented Jun 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

blhsing commented Jun 29, 2024

Uh oh!

miss-islington-app Bot commented Jun 29, 2024

Uh oh!

miss-islington-app Bot commented Jun 29, 2024

Uh oh!

bedevere-app Bot commented Jun 29, 2024

Uh oh!

serhiy-storchaka commented Jun 29, 2024

Uh oh!

bedevere-app Bot commented Jun 29, 2024

Uh oh!

bedevere-bot commented Jul 29, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

blhsing commented Jun 21, 2024 •

edited by jaraco

Loading

blhsing commented Jun 25, 2024 •

edited

Loading