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.

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

bpo-36959: Fix checks for invalid ISO date formats in _strptime #13408

Merged
merged 5 commits into from Dec 26, 2023

Conversation

GPHemsley
Copy link
Contributor

@GPHemsley GPHemsley commented May 18, 2019

Also simplifies the logic of the leap year check so that year is None is not checked twice.

https://bugs.python.org/issue36959

@serhiy-storchaka serhiy-storchaka enabled auto-merge (squash) December 26, 2023 19:12
@serhiy-storchaka serhiy-storchaka added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Dec 26, 2023
@serhiy-storchaka serhiy-storchaka merged commit 4b2c3e8 into python:main Dec 26, 2023
33 checks passed
@miss-islington-app
Copy link

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

@bedevere-app
Copy link

bedevere-app bot commented Dec 26, 2023

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 26, 2023
…ime() (pythonGH-13408)

Previously some error messages complained about incompatible
combinations of directives that are not contained in the format string.

(cherry picked from commit 4b2c3e8)

Co-authored-by: Gordon P. Hemsley <me@gphemsley.org>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@miss-islington-app
Copy link

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

cherry_picker 4b2c3e8e436b5191039cbe8cd9932654a60803e6 3.11

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Dec 26, 2023
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Dec 26, 2023
… _strptime() (pythonGH-13408)

Previously some error messages complained about incompatible
combinations of directives that are not contained in the format string.

(cherry picked from commit 4b2c3e8)

Co-authored-by: Gordon P. Hemsley <me@gphemsley.org>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Dec 26, 2023

GH-113499 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Dec 26, 2023
serhiy-storchaka added a commit that referenced this pull request Dec 26, 2023
… _strptime() (GH-13408) (GH-113495)

Previously some error messages complained about incompatible
combinations of directives that are not contained in the format string.

(cherry picked from commit 4b2c3e8)

Co-authored-by: Gordon P. Hemsley <me@gphemsley.org>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
serhiy-storchaka added a commit that referenced this pull request Dec 26, 2023
… _strptime() (GH-13408) (GH-113499)

Previously some error messages complained about incompatible
combinations of directives that are not contained in the format string.

(cherry picked from commit 4b2c3e8)

Co-authored-by: Gordon P. Hemsley <me@gphemsley.org>
kulikjak pushed a commit to kulikjak/cpython that referenced this pull request Jan 22, 2024
…ime() (pythonGH-13408)

Previously some error messages complained about incompatible
combinations of directives that are not contained in the format string.

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
…ime() (pythonGH-13408)

Previously some error messages complained about incompatible
combinations of directives that are not contained in the format string.

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants