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

Jump to bottom

bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines #17366

Merged
merged 9 commits into from Nov 24, 2019
Merged

bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines #17366

merged 9 commits into from Nov 24, 2019

Conversation

terryjreedy
Copy link
Member

@terryjreedy terryjreedy commented Nov 24, 2019 •
edited

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.

https://bugs.python.org/issue38862

terryjreedy added 5 commits Nov 24, 2019
@terryjreedy
bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines
45b6e3a 
A non-blank non-shell window should end with exactly one newline
following something other than space, tab, or newline.  It should
then be ready to commit to the cpython repository.
@terryjreedy
Add text parameter to mock Editor so a tk Text can be passed in.
db5d873
@terryjreedy
Add new code and test for fixing endlines.
f4dcabc
@terryjreedy
idlelib NEWS.txt entry
9a4d241
@terryjreedy
Update IDLE doc and help.html.
fff243b
@terryjreedy terryjreedy requested a review from taleinat Nov 24, 2019
@terryjreedy terryjreedy self-assigned this Nov 24, 2019
@terryjreedy
Copy link
Member Author

terryjreedy commented Nov 24, 2019

I think that this is ready to merge, but will wait half a day before doing so and moving on to invoking rstrip on save.

@terryjreedy
Copy link
Member Author

terryjreedy commented Nov 24, 2019 •
edited by bedevere-bot

Spec was revised after patchcheck experiment. See bpo-36682.

taleinat
taleinat reviewed Nov 24, 2019
View changes
Copy link
Contributor

@taleinat taleinat left a comment

Looks good Terry, just a few small comments for your consideration.

Lib/idlelib/idle_test/mock_idle.py Show resolved Hide resolved
Lib/idlelib/idle_test/test_format.py Outdated Show resolved Hide resolved
Misc/NEWS.d/next/IDLE/2019-11-23-21-50-57.bpo-38862.KQ9A0m.rst Outdated Show resolved Hide resolved
Misc/NEWS.d/next/IDLE/2019-11-23-21-50-57.bpo-38862.KQ9A0m.rst Outdated Show resolved Hide resolved
taleinat
taleinat approved these changes Nov 24, 2019
View changes
Copy link
Contributor

@taleinat taleinat left a comment

LGTM

@terryjreedy terryjreedy merged commit 6bf644e into python:master Nov 24, 2019
@terryjreedy terryjreedy deleted the endlines branch Nov 24, 2019
@miss-islington
Copy link
Contributor

miss-islington commented Nov 24, 2019

Thanks @terryjreedy for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 24, 2019
@terryjreedy @miss-islington
bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (pythonG…
20471f8 
…H-17366)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
(cherry picked from commit 6bf644e)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@bedevere-bot
Copy link

bedevere-bot commented Nov 24, 2019

GH-17370 is a backport of this pull request to the 3.8 branch.

@bedevere-bot
Copy link

bedevere-bot commented Nov 24, 2019

GH-17371 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 24, 2019
@terryjreedy @miss-islington
bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (pythonG…
f409fff 
…H-17366)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
(cherry picked from commit 6bf644e)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@python python deleted a comment Nov 24, 2019
@python python deleted a comment Nov 25, 2019
@miss-islington
Copy link
Contributor

miss-islington commented Nov 25, 2019

Thanks @terryjreedy for the PR 🌮🎉.. I'm working now to backport this PR to: 3.8.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

miss-islington commented Nov 25, 2019

Thanks @terryjreedy for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Nov 25, 2019

Thanks @terryjreedy for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Nov 25, 2019

Sorry, @terryjreedy, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6bf644ec82f14cceae68278dc35bafb00875efae 2.7

@miss-islington
Copy link
Contributor

miss-islington commented Nov 25, 2019

Thanks @terryjreedy for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Nov 25, 2019

Sorry @terryjreedy, I had trouble checking out the 3.7 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 6bf644ec82f14cceae68278dc35bafb00875efae 3.7

terryjreedy added a commit to terryjreedy/cpython that referenced this pull request Nov 25, 2019
@terryjreedy
[3.7] bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (p…
99294ed 
…ythonGH-17366)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
(cherry picked from commit 6bf644e)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
@terryjreedy terryjreedy mentioned this pull request Nov 25, 2019
Merged
@bedevere-bot
Copy link

bedevere-bot commented Nov 25, 2019

GH-17379 is a backport of this pull request to the 3.7 branch.

terryjreedy added a commit to terryjreedy/cpython that referenced this pull request Nov 25, 2019
@terryjreedy
[3.8] bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (p…
8dc85f0 
…ythonGH-17366)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
(cherry picked from commit 6bf644e)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
terryjreedy added a commit that referenced this pull request Nov 27, 2019
@terryjreedy
[3.7] bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (G…
2fb9719 
…H-17366) (#17379)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
(cherry picked from commit 6bf644e)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
terryjreedy added a commit that referenced this pull request Nov 27, 2019
@terryjreedy
[3.8] bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (G…
a9c86f5 
…H-17366)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
(cherry picked from commit 6bf644e)

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
jacobneiltaylor pushed a commit to jacobneiltaylor/cpython that referenced this pull request Dec 5, 2019
@terryjreedy
bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (python…
593851b 
…GH-17366)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
shihai1991 pushed a commit to shihai1991/cpython that referenced this pull request Jan 31, 2020
@terryjreedy @shihai1991
bpo-38862: IDLE Strip Trailing Whitespace fixes end newlines (python…
c0ed96d 
…GH-17366)

Extra newlines are removed at the end of non-shell files. If the file only has newlines after stripping other trailing whitespace, all are removed, as is done by patchcheck.py.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taleinat taleinat

Assignees

@terryjreedy terryjreedy

Labels
type-feature A feature request or enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@terryjreedy @miss-islington @bedevere-bot @taleinat @the-knights-who-say-ni