Skip to content

bpo-31673: Fixed typo in the name of Tkinter's method adderrorinfo().#3864

Merged
serhiy-storchaka merged 1 commit intopython:masterfrom
serhiy-storchaka:adderrorinfo
Oct 3, 2017
Merged

bpo-31673: Fixed typo in the name of Tkinter's method adderrorinfo().#3864
serhiy-storchaka merged 1 commit intopython:masterfrom
serhiy-storchaka:adderrorinfo

Conversation

@serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Oct 3, 2017 •
edited by bedevere-bot
Loading

@serhiy-storchaka serhiy-storchaka added needs backport to 3.6 type-bug An unexpected behavior, bug, or error labels Oct 3, 2017
@serhiy-storchaka serhiy-storchaka merged commit 929b40a into python:master Oct 3, 2017
@miss-islington
Copy link
Contributor

miss-islington commented Oct 3, 2017

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

miss-islington commented Oct 3, 2017

@serhiy-storchaka, Something is wrong... I can't backport for now.
Please backport using cherry_picker on command line.
cherry_picker 929b40a601db868530d6beaafb3256822103a7fb 3.6

@serhiy-storchaka serhiy-storchaka deleted the adderrorinfo branch October 3, 2017 18:37
@Mariatta
Copy link
Member

Mariatta commented Oct 3, 2017

One sec, I will retry the backport

@serhiy-storchaka
Copy link
Member Author

serhiy-storchaka commented Oct 3, 2017

Thanks @Mariatta!

@miss-islington
Copy link
Contributor

miss-islington commented Oct 3, 2017

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

@miss-islington
Copy link
Contributor

miss-islington commented Oct 3, 2017

Sorry, @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 929b40a601db868530d6beaafb3256822103a7fb 3.6

@Mariatta
Copy link
Member

Mariatta commented Oct 3, 2017

Thanks for the patience @serhiy-storchaka , seems like this will require a manual backport after all :)

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Oct 3, 2017
@serhiy-storchaka
[3.6] bpo-31673: Fixed typo in the name of Tkinter's method adderrori…
1320ca7 
…nfo(). (pythonGH-3864).

(cherry picked from commit 929b40a)
@bedevere-bot
Copy link

bedevere-bot commented Oct 3, 2017

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

@serhiy-storchaka
Copy link
Member Author

serhiy-storchaka commented Oct 3, 2017

@miss-islington is not able to resolve conflicts in generated files. The right way of resolving them -- remove the generated file and regenerate it.

serhiy-storchaka added a commit that referenced this pull request Oct 3, 2017
@serhiy-storchaka
[3.6] bpo-31673: Fixed typo in the name of Tkinter's method adderrori…
fcc832a 
…nfo(). (GH-3864). (#3873)

(cherry picked from commit 929b40a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@serhiy-storchaka @miss-islington @Mariatta @bedevere-bot @the-knights-who-say-ni