Skip to content

gh-122765: make prompt in activate.csh robust against unbalanced quotes and newlines#123751

Merged
brettcannon merged 9 commits intopython:mainfrom
JacekDuszenko:main
Sep 17, 2024
Merged

gh-122765: make prompt in activate.csh robust against unbalanced quotes and newlines#123751
brettcannon merged 9 commits intopython:mainfrom
JacekDuszenko:main

Conversation

@JacekDuszenko
Copy link
Copy Markdown
Contributor

@JacekDuszenko JacekDuszenko commented Sep 5, 2024 •
edited by picnixz
Loading

@ghost
Copy link
Copy Markdown

ghost commented Sep 5, 2024 •
edited by ghost
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app bedevere-app bot mentioned this pull request Sep 5, 2024
Closed
@bedevere-app
Copy link
Copy Markdown

bedevere-app bot commented Sep 5, 2024

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.

@picnixz picnixz changed the title gh-122765 make prompt in activate.csh robust against unbalanced quote… gh-122765: make prompt in activate.csh robust against unbalanced quotes and newlines Sep 6, 2024
picnixz
picnixz reviewed Sep 6, 2024
View reviewed changes
@JacekDuszenko
Copy link
Copy Markdown
Contributor Author

JacekDuszenko commented Sep 9, 2024

@zooba @brettcannon Could you guys please take a look at this PR? I see you have some commit history of editing this file. Thanks in advance!

@brettcannon
Copy link
Copy Markdown
Member

brettcannon commented Sep 10, 2024

Any URL available to read the docs on what :q does?

@brettcannon brettcannon self-requested a review September 10, 2024 21:21
@JacekDuszenko
Copy link
Copy Markdown
Contributor Author

JacekDuszenko commented Sep 11, 2024

https://linux.die.net/man/1/tcsh - :q makes sure each word is treated literally (wraps them in single quotes) and won’t be treated by the shell as e.g. a command.

@brettcannon brettcannon added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels Sep 16, 2024
@brettcannon brettcannon enabled auto-merge (squash) September 16, 2024 21:15
@brettcannon
Copy link
Copy Markdown
Member

brettcannon commented Sep 16, 2024

FYI the failures are unrelated. I'm trying to find out when they will be fixed.

@brettcannon
Copy link
Copy Markdown
Member

brettcannon commented Sep 16, 2024

@JacekDuszenko your PR is scaring GitHub as any attempt I make at merging main back into it doesn't do anything. Would you mind doing a manual merge w/ main?

@brettcannon brettcannon enabled auto-merge (squash) September 17, 2024 16:51
@brettcannon brettcannon merged commit a15a584 into python:main Sep 17, 2024
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Sep 17, 2024

Thanks @JacekDuszenko for the PR, and @brettcannon for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 17, 2024
@JacekDuszenko @miss-islington
pythongh-122765: make prompt in activate.csh robust against unbalance…
2d4b5c7 
…d quotes and newlines (pythonGH-123751)

(cherry picked from commit a15a584)

Co-authored-by: Jacek <jacek.duszenko@gmail.com>
@miss-islington-app
Copy link
Copy Markdown

miss-islington-app bot commented Sep 17, 2024

Sorry, @JacekDuszenko and @brettcannon, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker a15a584bf3f94ea11ab9363548c8872251364000 3.12

@bedevere-app
Copy link
Copy Markdown

bedevere-app bot commented Sep 17, 2024

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

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Sep 17, 2024
@brettcannon
Copy link
Copy Markdown
Member

brettcannon commented Sep 17, 2024

@JacekDuszenko Thanks for the PR! I'm not going to worry about backporting to 3.11 unless you want to make an explicit PR for it.

@zware zware mentioned this pull request Sep 18, 2024
Merged
savannahostrowski pushed a commit to savannahostrowski/cpython that referenced this pull request Sep 22, 2024
@JacekDuszenko @savannahostrowski
pythongh-122765: make prompt in activate.csh robust against unbalance…
b34d1a9 
…d quotes and newlines (pythonGH-123751)
brettcannon added a commit that referenced this pull request Oct 10, 2024
@miss-islington @JacekDuszenko @brettcannon
[3.13] gh-122765: make prompt in activate.csh robust against unbalanc…
9aa85f5 
…ed quotes and newlines (GH-123751) (GH-124185)

gh-122765: make prompt in activate.csh robust against unbalanced quotes and newlines (GH-123751)
(cherry picked from commit a15a584)

Co-authored-by: Jacek <jacek.duszenko@gmail.com>
Co-authored-by: Brett Cannon <brett@python.org>
@hugovk hugovk removed the needs backport to 3.12 only security fixes label Feb 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@picnixz picnixz picnixz left review comments

@brettcannon brettcannon brettcannon approved these changes

@vsajip vsajip Awaiting requested review from vsajip vsajip is a code owner

Assignees

@brettcannon brettcannon

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@JacekDuszenko @brettcannon @picnixz @hugovk