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-121277: Raise nice error on next as second argument to deprecated-removed #124623

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

encukou
Copy link
Member

@encukou encukou commented Sep 26, 2024

Using next as the second argument doesn't make sense, but users should get a nicer message than ValueError: invalid literal for int() -- especially since Sphinx hides the traceback by default.


📚 Documentation preview 📚: https://cpython-previews--124623.org.readthedocs.build/

Copy link
Member

@ezio-melotti ezio-melotti left a comment

Choose a reason for hiding this comment

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

I left a suggestion in case you want to be more explicit, but otherwise your version works too.

Comment on lines +291 to +293
if version_removed == 'next':
raise ValueError(
'deprecated-removed:: second argument cannot be `next`')
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if version_removed == 'next':
raise ValueError(
'deprecated-removed:: second argument cannot be `next`')
if version_removed == 'next':
raise ValueError(
'deprecated-removed:: second argument should be the version in which '
'the API will be removed, and cannot be `next`')

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the suggestion! But I do think it's too long, and I hope anyone who adds deprecated-removed:: already knows what the args are. If they need this error to find that out, something's very wrong :)

@encukou encukou merged commit e349f73 into python:main Sep 27, 2024
28 checks passed
@encukou encukou deleted the deprecated-removed-next branch September 27, 2024 23:02
encukou added a commit to encukou/cpython that referenced this pull request Sep 27, 2024
encukou added a commit that referenced this pull request Oct 25, 2024
…124718)

* gh-121277: Allow `.. versionadded:: next` in docs (GH-121278)

Make `versionchanged:: next`` expand to current (unreleased) version.

When a new CPython release is cut, the release manager will replace
all such occurences of "next" with the just-released version.
(See the issue for release-tools and devguide PRs.)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
(cherry picked from commit 7d24ea9)

* gh-121277: Raise nice error on `next` as second argument to deprecated-removed (GH-124623)

(cherry-picked from e349f73)
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 25, 2024
…nGH-121278) (pythonGH-124718)

* pythongh-121277: Allow `.. versionadded:: next` in docs (pythonGH-121278)

Make `versionchanged:: next`` expand to current (unreleased) version.

When a new CPython release is cut, the release manager will replace
all such occurences of "next" with the just-released version.
(See the issue for release-tools and devguide PRs.)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
(cherry picked from commit 7d24ea9)

* pythongh-121277: Raise nice error on `next` as second argument to deprecated-removed (pythonGH-124623)

(cherry-picked from e349f73)
(cherry picked from commit dba992b)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
encukou added a commit that referenced this pull request Oct 28, 2024
…H-125980)

Make `versionchanged:: next`` expand to current (unreleased) version.

When a new CPython release is cut, the release manager will replace
all such occurences of "next" with the just-released version.
(See the issue for release-tools and devguide PRs.)

(cherry picked from commit 7d24ea9)

Also backports a minor fix-up:
gh-121277: Raise nice error on `next` as second argument to deprecated-removed (GH-124623)

(cherry-picked from commit e349f73)

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

Successfully merging this pull request may close these issues.

2 participants