fix: normalize CRLF in CSS and XML/HTML prettifiers - #8405
Merged
mhils merged 2 commits intoAug 25, 2026
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
Windows checkouts feed CRLF into the CSS and XML/HTML content views, which then fail to match the expected LF-formatted fixtures. Normalize line endings before prettifying so the views are platform-independent. Fixes #8253.
Copy link
Copy Markdown
Member
|
Do I read this correctly that this is only an issue in tests? If yes, we should fix the tests. |
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
|
Yes — the reported failures are checkout-dependent tests, not a content-view runtime bug. Thanks for catching that. I updated the PR to keep the CSS and XML/HTML fixture directories on LF via .gitattributes, and removed both the production normalization and the CRLF behavior tests. Validation on the updated head:
|
Sorry, something went wrong.
mhils
approved these changes
Aug 25, 2026
mhils
enabled auto-merge (squash)
August 25, 2026 23:37
Copy link
Copy Markdown
Member
|
Thanks! |
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #8253.
What changed
CSS beautify() and the XML/HTML content view now normalize CRLF/CR to LF before formatting. On Windows, repository files are often checked out with CRLF, so the prettifiers produced output that did not match the LF fixtures.
Tests
Added explicit CRLF regression tests that do not depend on git autocrlf:
pytest test/mitmproxy/contentviews/test__view_css.py test/mitmproxy/contentviews/test__view_xml_html.py — 22 passed.
AI assistance disclosure
OpenAI Codex / Cursor Grok assisted with locating the prettify entry points, adding line-ending normalization, and drafting the regression tests. I reviewed the diff and ran the tests above.