Skip to content

bpo-33885: Replace "hook function" with "callable"#7765

Merged
terryjreedy merged 1 commit intopython:3.6from
andresdelfino:patch-3
Jun 22, 2018
Merged

bpo-33885: Replace "hook function" with "callable"#7765
terryjreedy merged 1 commit intopython:3.6from
andresdelfino:patch-3

Conversation

@andresdelfino
Copy link
Copy Markdown
Contributor

@andresdelfino andresdelfino commented Jun 17, 2018 •
edited by bedevere-bot
Loading

@terryjreedy terryjreedy added needs backport to 3.6 docs Documentation in the Doc dir skip news labels Jun 22, 2018
@terryjreedy terryjreedy merged commit c45cb47 into python:3.6 Jun 22, 2018
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jun 22, 2018

Thanks @andresdelfino for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 22, 2018

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 22, 2018
@andresdelfino @miss-islington
bpo-33885: Replace "hook function" with "callable" (pythonGH-7765)
14e9787 
(cherry picked from commit c45cb47)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jun 22, 2018

Sorry, @andresdelfino and @terryjreedy, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c45cb479074b5d25f0d382d3109f527520a9f03c 2.7

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jun 22, 2018

Sorry, @andresdelfino and @terryjreedy, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c45cb479074b5d25f0d382d3109f527520a9f03c 3.6

@terryjreedy
Copy link
Copy Markdown
Member

terryjreedy commented Jun 22, 2018

Andres, the backports are yours if you think them worthwhile. Ditto for 'complete progams', if the issue comes up.

miss-islington added a commit that referenced this pull request Jun 22, 2018
@miss-islington @andresdelfino
bpo-33885: Replace "hook function" with "callable" (GH-7765)
e4db730 
(cherry picked from commit c45cb47)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@andresdelfino andresdelfino deleted the patch-3 branch June 23, 2018 02:04
@andresdelfino andresdelfino restored the patch-3 branch June 23, 2018 02:07
@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jun 23, 2018

@terryjreedy

  1. I just noticied I select the wrong branch when making this PR, see that it points to 3.6.
  2. I'll gladly take the backports.
  3. What do you mean by: Ditto for 'complete progams', if the issue comes up.

Regarding the first item, the backport to 3.6 is no need, as the commit has merged into that branch already. I'll make the backport for 2.7. And a forwardport(?) for this to master. Or should we proceed otherwise?

@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jun 23, 2018

Regarding the third item, I see you were talking about #7744 :)

@terryjreedy
Copy link
Copy Markdown
Member

terryjreedy commented Jun 23, 2018

There are 3 options. I am going to ask on core_mentorship which is preferred.

@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jun 23, 2018

OK, I'll wait. Sorry for the inconvenience...

@terryjreedy
Copy link
Copy Markdown
Member

terryjreedy commented Jun 24, 2018

On core_mentorship, Nick Coughlin said "Just cherry pick to the full set of destinations from the original
commit rather than trying to revert anything." Go ahead.
He also had idea how Bedevere could catch mistake on submission.

@andresdelfino andresdelfino deleted the patch-3 branch June 24, 2018 01:48
@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jun 24, 2018

Great! I'll do it right away. Sorry for the hassle.

andresdelfino added a commit to andresdelfino/cpython that referenced this pull request Jun 24, 2018
@andresdelfino
[2.7] bpo-33885: Replace "hook function" with "callable" (pythonGH-7765…
537a558 
…).

(cherry picked from commit c45cb47)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 24, 2018

GH-7885 is a backport of this pull request to the 2.7 branch.

@terryjreedy terryjreedy mentioned this pull request Jun 24, 2018
Closed
terryjreedy pushed a commit that referenced this pull request Jun 24, 2018
@andresdelfino @terryjreedy
[2.7] bpo-33885: Replace "hook function" with "callable" (GH-7765). (#…
2c11e23 
…7885)

(cherry picked from commit c45cb47)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
andresdelfino added a commit to andresdelfino/cpython that referenced this pull request Jun 24, 2018
@andresdelfino
[master] bpo-33885: Replace "hook function" with "callable" (pythonGH…
460fed8 
…-7765)

(cherry picked from commit c45cb47)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@terryjreedy
Copy link
Copy Markdown
Member

terryjreedy commented Jun 24, 2018

Repositories are intentionally mistake resilient. The guaranteed way to never make a bad merge is to never make a merge. There have been people who have done the latter after getting commit privileges.
We still need a cherry-pick to master.

@andresdelfino andresdelfino mentioned this pull request Jun 24, 2018
Closed
@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jun 24, 2018

Oh, I already opened the PR, but it didn't reference this one. LEt me grab the link

@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jun 24, 2018

#7886

already committed, though :)

orsenthil pushed a commit that referenced this pull request Jun 24, 2018
@andresdelfino @orsenthil
[master] bpo-33885: Replace "hook function" with "callable" (GH-7765) (…
0ba9a0b 
…#7886)

(cherry picked from commit c45cb47)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jun 24, 2018

I guess "needs backport to 3.6" tag should be removed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@orsenthil orsenthil orsenthil approved these changes

@terryjreedy terryjreedy terryjreedy approved these changes

Assignees

@terryjreedy terryjreedy

Labels

docs Documentation in the Doc dir skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@andresdelfino @miss-islington @bedevere-bot @terryjreedy @orsenthil @Mariatta @the-knights-who-say-ni