Skip to content

[3.11] Trim trailing whitespace and test on CI (GH-104275)#108215

Merged
hugovk merged 8 commits into
python:3.11from
hugovk:3.11-pre-commit
Aug 22, 2023
Merged

[3.11] Trim trailing whitespace and test on CI (GH-104275)#108215
hugovk merged 8 commits into
python:3.11from
hugovk:3.11-pre-commit

Conversation

@hugovk

@hugovk hugovk commented Aug 21, 2023

Copy link
Copy Markdown
Member

No description provided.

@hugovk

hugovk commented Aug 21, 2023

Copy link
Copy Markdown
Member Author

I'll follow this with a combined backport of #105750 and #108212.

I left them out of this one to keep things separate and clearer.

@AlexWaygood AlexWaygood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A lot of this diff is removing invisible pagebreak characters. For most of these cases, we should delete the whole line rather than just stripping the "trailing whitespace" from the line:

Comment thread Lib/email/__init__.py Outdated
Comment thread Lib/email/base64mime.py Outdated
Comment thread Lib/email/base64mime.py Outdated
Comment thread Lib/email/base64mime.py Outdated
Comment thread Lib/email/base64mime.py Outdated
Comment thread Modules/_io/bufferedio.c
Comment thread Modules/_io/bufferedio.c
Comment thread Tools/i18n/pygettext.py Outdated
Comment thread Tools/i18n/pygettext.py Outdated
Comment thread Tools/i18n/pygettext.py Outdated
@AlexWaygood

Copy link
Copy Markdown
Member

See #102531 for where we removed invisible pagebreak characters from the main branch. (@hugovk, is it worth seeing if that PR could just be cleanly backported to 3.11?)

@hugovk

hugovk commented Aug 22, 2023

Copy link
Copy Markdown
Member Author

Good idea, and it backported cleanly 🎉 #108266

@AlexWaygood

This comment was marked as outdated.

@hugovk

hugovk commented Aug 22, 2023

Copy link
Copy Markdown
Member Author

Reverted Trim trailing whitespace, will update 3.11 into here, and then see what's left to fix.

@hugovk

hugovk commented Aug 22, 2023

Copy link
Copy Markdown
Member Author

And autofixed via pre-commit, let's check these changes.

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@hugovk

hugovk commented Aug 22, 2023

Copy link
Copy Markdown
Member Author

And applied the two suggestions which were still available.

@AlexWaygood AlexWaygood left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM now, thank you!

@hugovk hugovk merged commit d678ee7 into python:3.11 Aug 22, 2023
@hugovk hugovk deleted the 3.11-pre-commit branch August 22, 2023 09:57
@hugovk

hugovk commented Aug 22, 2023

Copy link
Copy Markdown
Member Author

Thank you very much for the reviews!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants