Skip to content

bpo-35482: Fixes HTML escaping in CHM index and build location of NEWS file #11224

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.

Sign up for GitHub

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
Merged
merged 1 commit into from
Dec 20, 2018
Merged

bpo-35482: Fixes HTML escaping in CHM index and build location of NEWS file #11224

merged 1 commit into from
Dec 20, 2018

Conversation

@zooba
Copy link
Member

@zooba zooba commented Dec 18, 2018 •
edited by bedevere-bot
Loading

@serhiy-storchaka
Copy link
Member

serhiy-storchaka commented Dec 19, 2018

I think it is worth a news entry. This fixes a user visible regression in RC.

@serhiy-storchaka serhiy-storchaka added needs backport to 3.6 type-bug An unexpected behavior, bug, or error labels Dec 19, 2018
@zooba
Copy link
Member Author

zooba commented Dec 20, 2018 •
edited
Loading

I don't think it needs NEWS - it was never released apart from in the RC.

@ned-deily This will need to be cherry-picked for both of your 3.6 and 3.7 branches. It should apply cleanly. [Edit: okay, it doesn't apply cleanly. Manual backport incoming.]

@zooba zooba merged commit afe17a7 into python:master Dec 20, 2018
@miss-islington
Copy link
Contributor

miss-islington commented Dec 20, 2018

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

@zooba zooba deleted the bpo-35482 branch December 20, 2018 02:20
@bedevere-bot
Copy link

bedevere-bot commented Dec 20, 2018

GH-11250 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 Dec 20, 2018
@zooba @miss-islington
bpo-35482: Fixes HTML escaping in CHM index and build location of NEW…
2fe7945 
…S file (pythonGH-11224)

(cherry picked from commit afe17a7)

Co-authored-by: Steve Dower <[email protected]>
@miss-islington
Copy link
Contributor

miss-islington commented Dec 20, 2018

Sorry, @zooba, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker afe17a7bee1bcb39dc56f2949431204918568ac1 3.6

zooba added a commit to zooba/cpython that referenced this pull request Dec 20, 2018
@zooba
bpo-35482: Fixes HTML escaping in CHM index and build location of NEW…
0b6faa3 
…S file (pythonGH-11224)
@zooba zooba mentioned this pull request Dec 20, 2018
Merged
@bedevere-bot
Copy link

bedevere-bot commented Dec 20, 2018

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

@serhiy-storchaka serhiy-storchaka mentioned this pull request Dec 20, 2018
Closed
miss-islington added a commit that referenced this pull request Dec 20, 2018
@miss-islington @zooba
bpo-35482: Fixes HTML escaping in CHM index and build location of NEW…
aae2e85 
…S file (GH-11224)

(cherry picked from commit afe17a7)

Co-authored-by: Steve Dower <[email protected]>
ned-deily pushed a commit that referenced this pull request Dec 20, 2018
@zooba @ned-deily
bpo-35482: Fixes HTML escaping in CHM index and build location of NEW…
789b0ee 
…S file (GH-11224) (GH-11251)
ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Dec 23, 2018
@miss-islington @zooba @ned-deily
bpo-35482: Fixes HTML escaping in CHM index and build location of NEW…
4db9a3f 
…S file (pythonGH-11224)

(cherry picked from commit afe17a7)

Co-authored-by: Steve Dower <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

@zooba zooba

Labels

OS-windows skip news 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

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