Skip to content

gh-118911: Trailing whitespace in a block shouldn't prevent the user from terminating the code block - #119355

Merged
ambv merged 8 commits into
python:mainfrom
aelsayed95:fix_issue_118911
May 22, 2024
Merged

gh-118911: Trailing whitespace in a block shouldn't prevent the user from terminating the code block#119355
ambv merged 8 commits into
python:mainfrom
aelsayed95:fix_issue_118911

Conversation

@aelsayed95

@aelsayed95aelsayed95 commented May 21, 2024•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Contributor

Issue described in #118911

Fix includes:

  1. If the user hits enter twice, they are able to exit out of the block, even if there's trailing whitespace.
  2. Trim trailing whitespace in the HistoricalReader to match IPython's behavior

@ghost

ghost commented May 21, 2024•
edited by ghost
Loading

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app

bedevere-appBot commented May 21, 2024

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@bedevere-appbedevere-appBot mentioned this pull request May 21, 2024
Closed
@lysnikolaoulysnikolaou added the topic-repl Related to the interactive shell label May 21, 2024
@aelsayed95

aelsayed95 commented May 21, 2024

Copy link
Copy Markdown
ContributorAuthor

One issue discovered while testing this (exists on main too):

Within a code block, if the user hits enter twice to add new lines, the first line matches the previous line's indentation while the next one doesn't.
This doesn't match IPython's behaviour.

@aelsayed95

aelsayed95 commented May 21, 2024

Copy link
Copy Markdown
ContributorAuthor

Added #119356

@lysnikolaoulysnikolaou added the needs backport to 3.13 bugs and security fixes label May 21, 2024
savannahostrowski
savannahostrowski reviewed May 21, 2024
View reviewed changes

@savannahostrowskisavannahostrowski left a comment •
edited
Loading

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.

Nice! I tested this on Fedora (via Devcontainer) and it looks like this now works as described.

Comment threadMisc/NEWS.d/next/Library/2024-05-21-20-13-23.gh-issue-118911.iG8nMq.rst Outdated
Comment threadLib/_pyrepl/readline.py Outdated
ambv
ambv approved these changes May 22, 2024
View reviewed changes

@ambvambv left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks good.

I merged new changes in main into your PR since there were conflicts, and reworded the blurb per my suggestion.

@ambv
ambv merged commit 5091c44 into python:mainMay 22, 2024
@miss-islington-app

miss-islington-appBot commented May 22, 2024

Copy link
Copy Markdown

Thanks @aelsayed95 for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

miss-islington-appBot commented May 22, 2024

Copy link
Copy Markdown

Sorry, @aelsayed95 and @ambv, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 5091c4400c9ea2a2d1e4d89a28c9d0de2651fa6d 3.13

@ambv

ambv commented May 22, 2024

Copy link
Copy Markdown
Contributor

Thanks, Aya! ✨ 🍰 ✨

@ambv

ambv commented May 22, 2024

Copy link
Copy Markdown
Contributor

The backport depends on GH-119362. I'll deal with that tomorrow.

@lysnikolaou

lysnikolaou commented May 22, 2024

Copy link
Copy Markdown
Member

Thanks, @aelsayed95! I've merged #119362. I'll open a backport PR now.

lysnikolaou pushed a commit to lysnikolaou/cpython that referenced this pull request May 22, 2024
@aelsayed95@ambv@lysnikolaou
[3.13]pythongh-118911: Trailing whitespace in a block shouldn't prev…
13c31f1
…ent the user from terminating the code block (pythonGH-119355)
(cherry picked from commit 5091c44)
Co-authored-by: Aya Elsayed <ayah.ehab11@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
@bedevere-app

bedevere-appBot commented May 22, 2024

Copy link
Copy Markdown

GH-119404 is a backport of this pull request to the 3.13 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label May 22, 2024
lysnikolaou added a commit that referenced this pull request May 23, 2024
@lysnikolaou@aelsayed95@ambv
[3.13]gh-118911: Trailing whitespace in a block shouldn't prevent th…
9fa1b4f
…e user from terminating the code block (GH-119355) (#119404)
(cherry picked from commit 5091c44)
Co-authored-by: Aya Elsayed <ayah.ehab11@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
@JelleZijlstraJelleZijlstra mentioned this pull request May 28, 2024
Closed
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
@aelsayed95@ambv@estyxx
pythongh-118911: Trailing whitespace in a block shouldn't prevent the…
0d1ccbb
… user from terminating the code block (python#119355)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@savannahostrowskisavannahostrowskisavannahostrowski left review comments
@ambvambvambv approved these changes

Assignees

@ambvambv

Labels

topic-replRelated to the interactive shell

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@aelsayed95@ambv@lysnikolaou@savannahostrowski