Skip to content
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

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

Merged
merged 8 commits into from
Aug 22, 2023

Conversation

hugovk
Copy link
Member

@hugovk hugovk commented Aug 21, 2023

No description provided.

@hugovk
Copy link
Member Author

hugovk commented Aug 21, 2023

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.

Copy link
Member

@AlexWaygood AlexWaygood left a comment

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:

Lib/email/__init__.py Outdated Show resolved Hide resolved
Lib/email/base64mime.py Outdated Show resolved Hide resolved
Lib/email/base64mime.py Outdated Show resolved Hide resolved
Lib/email/base64mime.py Outdated Show resolved Hide resolved
Lib/email/base64mime.py Outdated Show resolved Hide resolved
Modules/_io/bufferedio.c Outdated Show resolved Hide resolved
Modules/_io/bufferedio.c Outdated Show resolved Hide resolved
Tools/i18n/pygettext.py Outdated Show resolved Hide resolved
Tools/i18n/pygettext.py Outdated Show resolved Hide resolved
Tools/i18n/pygettext.py Outdated Show resolved Hide resolved
@AlexWaygood
Copy link
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
Copy link
Member Author

hugovk commented Aug 22, 2023

Good idea, and it backported cleanly 🎉 #108266

@AlexWaygood

This comment was marked as outdated.

@hugovk
Copy link
Member Author

hugovk commented Aug 22, 2023

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

@hugovk
Copy link
Member Author

hugovk commented Aug 22, 2023

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

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@hugovk
Copy link
Member Author

hugovk commented Aug 22, 2023

And applied the two suggestions which were still available.

Copy link
Member

@AlexWaygood AlexWaygood left a comment

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
20 checks passed
@hugovk hugovk deleted the 3.11-pre-commit branch August 22, 2023 09:57
@hugovk
Copy link
Member Author

hugovk commented Aug 22, 2023

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