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

Jump to bottom

Closes bpo-20216: Correct a misleading docstring #9873

Merged
merged 1 commit into from Oct 19, 2018
Merged

Closes bpo-20216: Correct a misleading docstring #9873

merged 1 commit into from Oct 19, 2018

Conversation

srinivasreddy
Copy link
Contributor

@srinivasreddy srinivasreddy commented Oct 14, 2018 •
edited

@serhiy-storchaka
Copy link
Member

serhiy-storchaka commented Oct 14, 2018

You need to regenerate Argument Clinic files.

make clinic

or

python3 Tools/clinic/clinic.py --make -f

@serhiy-storchaka
Copy link
Member

serhiy-storchaka commented Oct 14, 2018

Build is failing because you edited generated code but didn't update hashes.

@srinivasreddy
Copy link
Contributor Author

srinivasreddy commented Oct 19, 2018

@serhiy-storchaka What do you think now? merge?

@serhiy-storchaka serhiy-storchaka merged commit f192aeb into python:master Oct 19, 2018
@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Thanks @srinivasreddy for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 19, 2018
@srinivasreddy @miss-islington
bpo-20216: Correct docstrings of digest() methods in hashlib. (python…
1bd7bd5 
…GH-9873)

(cherry picked from commit f192aeb)

Co-authored-by: Srinivas  Thatiparthy (శ్రీనివాస్  తాటిపర్తి) <srinivasreddy@users.noreply.github.com>
@bedevere-bot
Copy link

bedevere-bot commented Oct 19, 2018

GH-9971 is a backport of this pull request to the 3.7 branch.

@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Sorry, @srinivasreddy and @serhiy-storchaka, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker f192aeb95a139ede74d69e39c046c498ff288a37 3.6

vstinner pushed a commit that referenced this pull request Oct 19, 2018
@miss-islington @srinivasreddy @vstinner
bpo-20216: Correct docstrings of digest() methods in hashlib. (GH-9873)…
23efe77 
… (GH-9971)

(cherry picked from commit f192aeb)

Co-authored-by: Srinivas  Thatiparthy (శ్రీనివాస్  తాటిపర్తి) <srinivasreddy@users.noreply.github.com>
serhiy-storchaka pushed a commit to serhiy-storchaka/cpython that referenced this pull request Oct 28, 2018
@srinivasreddy @serhiy-storchaka
[3.6] bpo-20216: Correct docstrings of digest() methods in hashlib. (p…
f804006 
…ythonGH-9873).

(cherry picked from commit f192aeb)

Co-authored-by: Srinivas  Thatiparthy (శ్రీనివాస్  తాటిపర్తి) <srinivasreddy@users.noreply.github.com>
@bedevere-bot
Copy link

bedevere-bot commented Oct 28, 2018

GH-10183 is a backport of this pull request to the 3.6 branch.

@serhiy-storchaka serhiy-storchaka removed their assignment Oct 28, 2018
serhiy-storchaka added a commit that referenced this pull request Oct 28, 2018
@serhiy-storchaka @srinivasreddy
[3.6] bpo-20216: Correct docstrings of digest() methods in hashlib. (G…
f29bded 
…H-9873). (GH-10183)

(cherry picked from commit f192aeb)

Co-authored-by: Srinivas  Thatiparthy (శ్రీనివాస్  తాటిపర్తి) <srinivasreddy@users.noreply.github.com>
@srinivasreddy srinivasreddy deleted the 20216 branch Oct 28, 2018
yahya-abou-imran pushed a commit to yahya-abou-imran/cpython that referenced this pull request Nov 2, 2018
@srinivasreddy @yahya-abou-imran
bpo-20216: Correct docstrings of digest() methods in hashlib. (python…
ae9375c 
…GH-9873)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serhiy-storchaka serhiy-storchaka

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@srinivasreddy @serhiy-storchaka @miss-islington @bedevere-bot @the-knights-who-say-ni