Skip to content

gh-131204: Fix difflib.HtmlDiff may not use monospaced font #131221

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

Merged
merged 4 commits into from
Mar 14, 2025

Conversation

Wulian233
Copy link
Contributor

@Wulian233 Wulian233 commented Mar 14, 2025

@Wulian233
Copy link
Contributor Author

CC @hugovk request review :)

@picnixz picnixz requested a review from hugovk March 14, 2025 09:45
@hugovk hugovk added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Mar 14, 2025
@hugovk
Copy link
Member

hugovk commented Mar 14, 2025

Thank you!

@hugovk hugovk enabled auto-merge (squash) March 14, 2025 10:22
@hugovk hugovk merged commit 7fd6160 into python:main Mar 14, 2025
43 checks passed
@miss-islington-app
Copy link

Thanks @Wulian233 for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @Wulian233 and @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 7fd61607cd28ec466717c78adfb1eb5b63add1f0 3.13

@miss-islington-app
Copy link

Sorry, @Wulian233 and @hugovk, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 7fd61607cd28ec466717c78adfb1eb5b63add1f0 3.12

@Wulian233 Wulian233 deleted the difflib-font branch March 14, 2025 10:48
@hugovk
Copy link
Member

hugovk commented Mar 14, 2025

@Wulian233 Please could you take care of backports? Thank you!

@Wulian233
Copy link
Contributor Author

@Wulian233 Please could you take care of backports? Thank you!

Sure!

#131242
#131243

@bedevere-app
Copy link

bedevere-app bot commented Mar 14, 2025

GH-131242 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Mar 14, 2025
@bedevere-app
Copy link

bedevere-app bot commented Mar 14, 2025

GH-131243 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 only security fixes label Mar 14, 2025
hugovk pushed a commit that referenced this pull request Mar 14, 2025
hugovk pushed a commit that referenced this pull request Mar 14, 2025
mikec9 pushed a commit to mikec9/cpython that referenced this pull request Mar 14, 2025
plashchynski pushed a commit to plashchynski/cpython that referenced this pull request Mar 17, 2025
…ython#131221)

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
seehwan pushed a commit to seehwan/cpython that referenced this pull request Apr 16, 2025
…ython#131221)

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

difflib-generated HTML file does not use monospaced font
2 participants