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

@hugovkhugovk commented Aug 21, 2023

Copy link
Copy Markdown
Member

No description provided.

@bedevere-botbedevere-bot mentioned this pull request Aug 21, 2023
Merged
@hugovk
hugovk requested review from AlexWaygood and removed request for a team, 1st1, asvetlov and tiranAugust 21, 2023 13:35
@hugovk

hugovk commented Aug 21, 2023

Copy link
Copy Markdown
MemberAuthor

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 reviewed Aug 22, 2023
View reviewed changes

@AlexWaygoodAlexWaygood 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 threadLib/email/__init__.py Outdated
Comment threadLib/email/base64mime.py Outdated
Comment threadLib/email/base64mime.py Outdated
Comment threadLib/email/base64mime.py Outdated
Comment threadLib/email/base64mime.py Outdated
Comment threadModules/_io/bufferedio.c
Comment threadModules/_io/bufferedio.c
Comment threadTools/i18n/pygettext.py Outdated
Comment threadTools/i18n/pygettext.py Outdated
Comment threadTools/i18n/pygettext.py Outdated
@AlexWaygood

AlexWaygood commented Aug 22, 2023

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
MemberAuthor

Good idea, and it backported cleanly 🎉 #108266

@AlexWaygood

This comment was marked as outdated.

Sign in to view
@hugovk

hugovk commented Aug 22, 2023

Copy link
Copy Markdown
MemberAuthor

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
MemberAuthor

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

@hugovk@AlexWaygood
Apply suggestions from code review
b0f574b
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
@hugovk

hugovk commented Aug 22, 2023

Copy link
Copy Markdown
MemberAuthor

And applied the two suggestions which were still available.

AlexWaygood
AlexWaygood approved these changes Aug 22, 2023
View reviewed changes

@AlexWaygoodAlexWaygood 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.11Aug 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
MemberAuthor

Thank you very much for the reviews!

@hugovkhugovk mentioned this pull request Aug 22, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AlexWaygoodAlexWaygoodAlexWaygood approved these changes
@ezio-melottiezio-melottiAwaiting requested review from ezio-melottiezio-melotti is a code owner

Assignees

No one assigned

Labels

skip issueskip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hugovk@AlexWaygood@bedevere-bot