Skip to content

gh-126035: add missing whitespace to *Py_EnterRecursiveCall messages#126036

Merged
erlend-aasland merged 1 commit into
python:mainfrom
picnixz:fix/typo-in-recursion-errors
Oct 27, 2024
Merged

gh-126035: add missing whitespace to *Py_EnterRecursiveCall messages#126036
erlend-aasland merged 1 commit into
python:mainfrom
picnixz:fix/typo-in-recursion-errors

Conversation

@picnixz
Copy link
Copy Markdown
Member

@picnixz picnixz commented Oct 27, 2024 •
edited by bedevere-app Bot
Loading

I don't know how to test it easily though so if anyone knows, feel free to help me! (or we can just observe that all other occurrences are prefixing the message with a whitespace and be done).

@picnixz picnixz requested a review from rhettinger as a code owner October 27, 2024 12:30
@bedevere-app bedevere-app Bot mentioned this pull request Oct 27, 2024
Closed
@picnixz picnixz added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Oct 27, 2024
@ZeroIntensity
Copy link
Copy Markdown
Member

ZeroIntensity commented Oct 27, 2024

The way to test it would be to just trigger the recursion error and then catch it with an assertRaisesRegex. An alternative solution here would be to implicitly add leading whitespace in _Py_EnterCursiveCall if it's not there already (changing it for the public one would be a breaking change).

@picnixz
Copy link
Copy Markdown
Member Author

picnixz commented Oct 27, 2024

The way to test it would be to just trigger the recursion error

Yes, that's what I wanted to find :') (I was a bit lazy here TBH).

An alternative solution here would be to implicitly add leading whitespace in _Py_EnterCursiveCall if it's not there already

I don't really want to. At least, it doesn't hurt to always add it. We could implicitly add the whitespace by using strncmp (which was my original idea) but I think it's just easier to include it in the message.

@erlend-aasland erlend-aasland changed the title gh-126035: fix some typos in *Py_EnterRecursiveCall* usages gh-126035: add missing whitespace in *Py_EnterRecursiveCall messages Oct 27, 2024
@erlend-aasland erlend-aasland changed the title gh-126035: add missing whitespace in *Py_EnterRecursiveCall messages gh-126035: add missing whitespace to *Py_EnterRecursiveCall messages Oct 27, 2024
ZeroIntensity
ZeroIntensity approved these changes Oct 27, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@ZeroIntensity ZeroIntensity left a comment

Choose a reason for hiding this comment

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

I wasn't actually able to trigger the RecursionError in either of these cases--the "while calling a Python object" beat it, so this might be dead code anyway. LGTM!

@erlend-aasland erlend-aasland merged commit 19e93e2 into python:main Oct 27, 2024
@miss-islington-app

This comment was marked as outdated.

Sign in to view
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 27, 2024
@picnixz @miss-islington
pythongh-126035: add missing whitespace to *Py_EnterRecursiveCall() m…
2d221ee 
…essages (pythonGH-126036)

(cherry picked from commit 19e93e2)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 27, 2024
@picnixz @miss-islington
pythongh-126035: add missing whitespace to *Py_EnterRecursiveCall() m…
1fde48e 
…essages (pythonGH-126036)

(cherry picked from commit 19e93e2)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
@bedevere-app
Copy link
Copy Markdown

bedevere-app Bot commented Oct 27, 2024

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

@bedevere-app bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Oct 27, 2024
@bedevere-app
Copy link
Copy Markdown

bedevere-app Bot commented Oct 27, 2024

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

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Oct 27, 2024
@picnixz picnixz deleted the fix/typo-in-recursion-errors branch October 27, 2024 22:02
erlend-aasland pushed a commit that referenced this pull request Oct 27, 2024
@miss-islington @picnixz
[3.12] gh-126035: add missing whitespace to *Py_EnterRecursiveCall() …
9f35fbc 
…messages (GH-126036) (#126059)

(cherry picked from commit 19e93e2)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
erlend-aasland pushed a commit that referenced this pull request Oct 27, 2024
@miss-islington @picnixz
[3.13] gh-126035: add missing whitespace to *Py_EnterRecursiveCall() …
97c2e6a 
…messages (GH-126036) (#126058)

(cherry picked from commit 19e93e2)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
picnixz added a commit to picnixz/cpython that referenced this pull request Dec 8, 2024
@picnixz
pythongh-126035: add missing whitespace to *Py_EnterRecursiveCall() m…
0af323e 
…essages (python#126036)
ebonnal pushed a commit to ebonnal/cpython that referenced this pull request Jan 12, 2025
@picnixz @ebonnal
pythongh-126035: add missing whitespace to *Py_EnterRecursiveCall() m…
7266b6f 
…essages (python#126036)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@erlend-aasland erlend-aasland erlend-aasland approved these changes

@ZeroIntensity ZeroIntensity ZeroIntensity approved these changes

@rhettinger rhettinger Awaiting requested review from rhettinger rhettinger is a code owner

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@picnixz @ZeroIntensity @erlend-aasland