Skip to content

Conversation

serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Sep 17, 2020

@miss-islington
Copy link
Contributor

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

@serhiy-storchaka serhiy-storchaka deleted the remove-htmlparser-unescape branch September 17, 2020 08:49
@miss-islington
Copy link
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a33f2c2bae759fc9d06e1c032fd2026135f2df45 3.9

@terryjreedy
Copy link
Member

I am looking to discover the conflict and how to best resolve it.

@terryjreedy terryjreedy added needs backport to 3.9 only security fixes and removed needs backport to 3.9 only security fixes labels Sep 17, 2020
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @serhiy-storchaka, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker a33f2c2bae759fc9d06e1c032fd2026135f2df45 3.9

terryjreedy added a commit to terryjreedy/cpython that referenced this pull request Sep 18, 2020
terryjreedy added a commit to terryjreedy/cpython that referenced this pull request Sep 18, 2020
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 18, 2020
@bedevere-bot
Copy link

GH-22293 is a backport of this pull request to the 3.9 branch.

@terryjreedy
Copy link
Member

The problem was that there was only 1 space above the following 'Porting...' in master, at least when this diff was created, while there were already 2 in the 3.9 version of the same file.

terryjreedy added a commit that referenced this pull request Sep 18, 2020
@serhiy-storchaka
Copy link
Member Author

Thank you Terry!

ambv pushed a commit to ambv/cpython that referenced this pull request Oct 4, 2020
xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
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 skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants