gh-106359: Fix corner case bugs in Argument Clinic converter parser by erlend-aasland · Pull Request #106361 · python/cpython

erlend-aasland · 2023-07-03T11:50:46Z

DSLParser.parse_converter() could return unusable kwdicts in some rare cases

Issue: Argument Clinic: DSLParser.parse_converter() can return an incorrect kwargs dict #106359

…rser DSLParser.parse_converter() could return unusable kwdicts in some rare cases

erlend-aasland · 2023-07-03T11:51:48Z

I took the liberty of cleaning up the test case a little bit.

erlend-aasland · 2023-07-03T12:21:36Z

Backport to 3.12 and possibly 3.11?

AlexWaygood

Looks great! One small suggestion to make the test slightly more exacting:

AlexWaygood · 2023-07-03T12:24:02Z

Backport to 3.12 and possibly 3.11?

I was wondering about that. I doubt it'll backport cleanly, though, and this seems like very much a corner-case bug that people are unlikely to hit in practice. So maybe not worth it?

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

erlend-aasland · 2023-07-03T12:25:40Z

Backport to 3.12 and possibly 3.11?
I was wondering about that. I doubt it'll backport cleanly, though, and this seems like very much a corner-case bug that people are unlikely to hit in practice. So maybe not worth it?

Yeah, I was thinking the same. Let's try 3.12; if the witch can backport it, it's ok; if she fails, let's not bother.

AlexWaygood

...Two more small nits, sorry!

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

…59.RfJuR0.rst

AlexWaygood

🚀

AlexWaygood

Thanks! The new test cases make it clearer what we're testing here. (I'm losing count of the number of times I'm approving this PR 😄)

erlend-aasland · 2023-07-03T12:52:31Z

Thanks! The new test cases make it clearer what we're testing here. (I'm losing count of the number of times I'm approving this PR 😄)

THIS IS THE FINAL VERSION! 🤞

miss-islington · 2023-07-03T13:15:03Z

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

…rser (pythonGH-106361) DSLParser.parse_converter() could return unusable kwdicts in some rare cases (cherry picked from commit 0da4c88) Co-authored-by: Erlend E. Aasland <erlend@python.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

bedevere-bot · 2023-07-03T13:15:15Z

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

…arser (GH-106361) (#106364) gh-106359: Fix corner case bugs in Argument Clinic converter parser (GH-106361) DSLParser.parse_converter() could return unusable kwdicts in some rare cases (cherry picked from commit 0da4c88) Co-authored-by: Erlend E. Aasland <erlend@python.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

* main: (167 commits) pythongh-91053: make func watcher tests resilient to other func watchers (python#106286) pythongh-104050: Add more type hints to Argument Clinic DSLParser() (python#106354) pythongh-106359: Fix corner case bugs in Argument Clinic converter parser (python#106361) pythongh-104146: Remove unused attr 'parameter_indent' from clinic.DLParser (python#106358) pythongh-106320: Remove private _PyErr C API functions (python#106356) pythongh-104050: Annotate Argument Clinic DSLParser attributes (python#106357) pythongh-106320: Create pycore_modsupport.h header file (python#106355) pythongh-106320: Move _PyUnicodeWriter to the internal C API (python#106342) pythongh-61215: New mock to wait for multi-threaded events to happen (python#16094) Document PYTHONSAFEPATH along side -P (python#106122) Replace the esoteric term 'datum' when describing dict comprehensions (python#106119) pythongh-104050: Add more type hints to Argument Clinic DSLParser() (python#106343) pythongh-106320: _testcapi avoids private _PyUnicode_EqualToASCIIString() (python#106341) pythongh-106320: Add pycore_complexobject.h header file (python#106339) pythongh-106078: Move DecimalException to _decimal state (python#106301) pythongh-106320: Use _PyInterpreterState_GET() (python#106336) pythongh-106320: Remove private _PyInterpreterState functions (python#106335) pythongh-104922: Doc: add note about PY_SSIZE_T_CLEAN (python#106314) pythongh-106217: Truncate the issue body size of `new-bugs-announce-notifier` (python#106329) pythongh-104922: remove PY_SSIZE_T_CLEAN (python#106315) ...

pythongh-106359: Fix corner case bugs in Argument Clinic converter pa…
851f63c
…rser DSLParser.parse_converter() could return unusable kwdicts in some rare cases

erlend-aasland requested a review from AlexWaygood July 3, 2023 11:50

bedevere-bot added the awaiting core review label Jul 3, 2023

bedevere-bot mentioned this pull request Jul 3, 2023
Argument Clinic: DSLParser.parse_converter() can return an incorrect kwargs dict #106359
Closed

erlend-aasland commented Jul 3, 2023
View reviewed changes

Comment threadTools/clinic/clinic.py Outdated

AlexWaygood reviewed Jul 3, 2023
View reviewed changes

Comment threadTools/clinic/clinic.py Outdated

erlend-aasland added 5 commits July 3, 2023 13:57

Move KwargDict up and name it slightly better
bb879cc

Remove debug print
07abdd5

Add NEWS
5009748

Address review: try with a slightly more accurate error message
288d8ca

kwarg splat
7efc3b4

AlexWaygood approved these changes Jul 3, 2023
View reviewed changes

Comment threadLib/test/test_clinic.py Outdated

bedevere-bot removed the awaiting core review label Jul 3, 2023

Address review: make the test slightly more accurate
5ac8553
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

erlend-aasland added the needs backport to 3.12 only security fixes label Jul 3, 2023

erlend-aasland enabled auto-merge (squash) July 3, 2023 12:26

erlend-aasland linked an issue Jul 3, 2023 that may be closed by this pull request
Argument Clinic: DSLParser.parse_converter() can return an incorrect kwargs dict #106359
Closed

AlexWaygood reviewed Jul 3, 2023
View reviewed changes

Comment threadMisc/NEWS.d/next/Tools-Demos/2023-07-03-14-06-19.gh-issue-106359.RfJuR0.rst Outdated
Comment threadLib/test/test_clinic.py Outdated

Apply suggestions from code review
5d88ab6
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

erlend-aasland commented Jul 3, 2023
View reviewed changes

Comment threadMisc/NEWS.d/next/Tools-Demos/2023-07-03-14-06-19.gh-issue-106359.RfJuR0.rst Outdated

Update Misc/NEWS.d/next/Tools-Demos/2023-07-03-14-06-19.gh-issue-1063…
2a3e35f
…59.RfJuR0.rst

AlexWaygood approved these changes Jul 3, 2023
View reviewed changes

bedevere-bot added the awaiting merge label Jul 3, 2023

fix lint
ec602b5

AlexWaygood reviewed Jul 3, 2023
View reviewed changes

Comment threadLib/test/test_clinic.py

Fix test
8fcb618

Add a few more tests
67425eb

AlexWaygood reviewed Jul 3, 2023
View reviewed changes

Comment threadLib/test/test_clinic.py Outdated

erlend-aasland added 2 commits July 3, 2023 14:48

Don't just use None
277c01b

quotes
99ad510

AlexWaygood approved these changes Jul 3, 2023
View reviewed changes

erlend-aasland merged commit 0da4c88 into python:mainJul 3, 2023

bedevere-bot removed the awaiting merge label Jul 3, 2023

bedevere-bot removed the needs backport to 3.12 only security fixes label Jul 3, 2023

erlend-aasland deleted the clinic/fix-parse-converter branch July 3, 2023 13:16

Uh oh!

Uh oh!

Conversation

erlend-aasland commented Jul 3, 2023• edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

erlend-aasland commented Jul 3, 2023

Uh oh!

Uh oh!

Uh oh!

erlend-aasland commented Jul 3, 2023

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AlexWaygood commented Jul 3, 2023

Uh oh!

erlend-aasland commented Jul 3, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

AlexWaygood left a comment

Choose a reason for hiding this comment

Uh oh!

erlend-aasland commented Jul 3, 2023

Uh oh!

miss-islington commented Jul 3, 2023

Uh oh!

bedevere-bot commented Jul 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

erlend-aasland commented Jul 3, 2023•
edited by bedevere-bot
Loading

erlend-aasland commented Jul 3, 2023•
edited
Loading