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

gh-106359: Fix corner case bugs in Argument Clinic converter parser #106361

Merged
merged 14 commits into from Jul 3, 2023

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Jul 3, 2023

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

…rser

DSLParser.parse_converter() could return unusable kwdicts in some rare cases
@erlend-aasland
Copy link
Contributor Author

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

Tools/clinic/clinic.py Outdated Show resolved Hide resolved
Tools/clinic/clinic.py Outdated Show resolved Hide resolved
@erlend-aasland
Copy link
Contributor Author

Backport to 3.12 and possibly 3.11?

Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Lib/test/test_clinic.py Outdated Show resolved Hide resolved
@AlexWaygood
Copy link
Member

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
Copy link
Contributor Author

erlend-aasland commented Jul 3, 2023

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.

@erlend-aasland erlend-aasland added the needs backport to 3.12 bug and security fixes label Jul 3, 2023
@erlend-aasland erlend-aasland enabled auto-merge (squash) July 3, 2023 12:26
Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...Two more small nits, sorry!

Lib/test/test_clinic.py Outdated Show resolved Hide resolved
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

Lib/test/test_clinic.py Outdated Show resolved Hide resolved
Lib/test/test_clinic.py Outdated Show resolved Hide resolved
Copy link
Member

@AlexWaygood AlexWaygood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor Author

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! 🤞

@erlend-aasland erlend-aasland merged commit 0da4c88 into python:main Jul 3, 2023
22 checks passed
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 3, 2023
…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
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jul 3, 2023
@erlend-aasland erlend-aasland deleted the clinic/fix-parse-converter branch July 3, 2023 13:16
AlexWaygood added a commit that referenced this pull request Jul 3, 2023
…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>
carljm added a commit to carljm/cpython that referenced this pull request Jul 3, 2023
* 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)
  ...
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.

Argument Clinic: DSLParser.parse_converter() can return an incorrect kwargs dict
4 participants