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-91134: Correct docstrings for built-in in-place operators #31802

Merged
merged 6 commits into from
Feb 18, 2023

Conversation

nickovs
Copy link
Contributor

@nickovs nickovs commented Mar 10, 2022

The whitespace in the example code included in the doc string has also been made PEP-8 compliant.

https://bugs.python.org/issue46978

Automerge-Triggered-By: GH:rhettinger

…ors.

The whitespace in the example in the string has also been mde PEP-8 compliant.
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@nickovs

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

Copy link
Contributor

@MaxwellDupre MaxwellDupre left a comment

Choose a reason for hiding this comment

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

Couldn't find out how to test slots so ran full suite:
412 tests OK.
2 tests failed:
test_asyncio test_embed
I think this qualifies as a pass. Anyway this has no side effects.

@rhettinger
Copy link
Contributor

Closing and reopening to trigger the bots.

@rhettinger rhettinger closed this May 10, 2022
@rhettinger rhettinger reopened this May 10, 2022
@cpython-cla-bot
Copy link

cpython-cla-bot bot commented May 10, 2022

All commit authors signed the Contributor License Agreement.
CLA signed

@miss-islington
Copy link
Contributor

@nickovs: Status check is done, and it's a failure ❌ .

@rhettinger
Copy link
Contributor

Please sign the CLA or we can't go forward.

@nickovs
Copy link
Contributor Author

nickovs commented Aug 8, 2022

I already signed the CLA, back on March 11th, but it seems that there is a bug in the CLA-checking bot that means that if you have multiple email addresses on your GitHub account it needs you to sign multiple CLAs, in the same name but listing the different addresses. I've signed a second CLA so hopefully this can proceed.

@JelleZijlstra JelleZijlstra self-assigned this Oct 6, 2022
@JelleZijlstra JelleZijlstra added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Oct 6, 2022
@JelleZijlstra
Copy link
Member

JelleZijlstra commented Oct 6, 2022

Unfortunately the CLA check is still failing.

As a workaround, maybe you can re-commit with the email address you signed the CLA with and force-push the branch.

@miss-islington
Copy link
Contributor

@nickovs: Status check is done, and it's a failure or timed out ❌.

@nickovs
Copy link
Contributor Author

nickovs commented Feb 8, 2023

OK. The system seems to now be showing the CLA is signed and all checks are passing.

@CuriousLearner
Copy link
Member

That's amazing!! Thanks for your help Nicko!

@rhettinger / @JelleZijlstra We can get this merged in now :)

@arhadthedev
Copy link
Member

The CLA check is green; merging main to retrigger the automerge label processing.

@arhadthedev arhadthedev removed the pending The issue will be closed if no feedback is provided label Feb 18, 2023
@arhadthedev
Copy link
Member

MacOS failure is known and is being fixed on the GitHub side. @iritkatriel could you merge this PR (with its backports) manually please? All other tests successfully pass.

@iritkatriel iritkatriel added the docs Documentation in the Doc dir label Feb 18, 2023
@iritkatriel iritkatriel merged commit 128379b into python:main Feb 18, 2023
@miss-islington
Copy link
Contributor

Thanks @nickovs for the PR, and @iritkatriel for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @nickovs and @iritkatriel, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 128379b8cdb88a6d3d7fed24df082c9a654b3fb8 3.11

@miss-islington
Copy link
Contributor

Sorry @nickovs and @iritkatriel, I had trouble checking out the 3.10 backport branch.
Please retry by removing and re-adding the "needs backport to 3.10" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 128379b8cdb88a6d3d7fed24df082c9a654b3fb8 3.10

arhadthedev pushed a commit to arhadthedev/cpython that referenced this pull request Feb 19, 2023
arhadthedev pushed a commit to arhadthedev/cpython that referenced this pull request Feb 19, 2023
@arhadthedev
Copy link
Member

@merwok
Copy link
Member

merwok commented Feb 22, 2023

Before backporting, could people go to the issue first to discuss the relevance of this change?

@rhettinger does not agree that there is a bug to be fixed here and requested to revert.

@iritkatriel
Copy link
Member

@rhettinger does not agree that there is a bug to be fixed here and requested to revert.

This PR was approved by @rhettinger .

iritkatriel added a commit to iritkatriel/cpython that referenced this pull request Feb 22, 2023
@iritkatriel
Copy link
Member

PR to revert the change: #102146

Let's close the issue once we've come to a decision on this.

@JelleZijlstra
Copy link
Member

For ease of reference, the issue is #91134 and the relevant comment is #91134 (comment).

@AlexWaygood AlexWaygood changed the title bpo-46978: Correct docstrings for built-in in-place operators gh-91134: Correct docstrings for built-in in-place operators Feb 22, 2023
iritkatriel added a commit that referenced this pull request Feb 23, 2023
…31802) (#102146)

Revert "bpo-46978: Correct docstrings for in-place builtin operators (#31802)"

This reverts commit 128379b.
@bedevere-bot
Copy link

GH-102041 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label May 20, 2023
@arhadthedev arhadthedev removed the needs backport to 3.11 only security fixes label May 20, 2023
JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Sep 10, 2024
…ython#31802) (python#102146)

Revert "bpo-46978: Correct docstrings for in-place builtin operators (python#31802)"

This reverts commit 128379b.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.