Skip to content

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

Merged
hugovk merged 4 commits into
python:mainfrom
Wulian233:difflib-font
Mar 14, 2025
Merged

gh-131204: Fix difflib.HtmlDiff may not use monospaced font#131221
hugovk merged 4 commits into
python:mainfrom
Wulian233:difflib-font

Conversation

@Wulian233

@Wulian233 Wulian233 commented Mar 14, 2025

Copy link
Copy Markdown
Contributor

@Wulian233

Copy link
Copy Markdown
Contributor Author

CC @hugovk request review :)

@picnixz picnixz requested a review from hugovk March 14, 2025 09:45
Comment thread Misc/NEWS.d/next/Library/2025-03-14-09-28-13.gh-issue-131204.wogNEX.rst Outdated
@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

hugovk commented Mar 14, 2025

Copy link
Copy Markdown
Member

Thank you!

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

Copy link
Copy Markdown

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
Copy Markdown

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
Copy Markdown

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

hugovk commented Mar 14, 2025

Copy link
Copy Markdown
Member

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

@Wulian233

Copy link
Copy Markdown
Contributor Author

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

Sure!

#131242
#131243

@bedevere-app

bedevere-app Bot commented Mar 14, 2025

Copy link
Copy Markdown

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

bedevere-app Bot commented Mar 14, 2025

Copy link
Copy Markdown

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>
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