8000 gh-121245: Amend d611c4c8e9 (correct import) by skirpichev · Pull Request #121255 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-121245: Amend d611c4c8e9 (correct import) #121255

8000
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.

Sign up for GitHub

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
Merged
merged 3 commits into from
Jul 2, 2024
Merged

gh-121245: Amend d611c4c8e9 (correct import) #121255

merged 3 commits into from
Jul 2, 2024

Conversation

skirpichev
Copy link
Contributor
@skirpichev skirpichev commented Jul 2, 2024 •
edited
Loading

This prevents writing incorrect history (empty).

Fixed by @domdfcoding.

@skirpichev
pythongh-121245: Amend 38cfa92 (correct import)
2ee2fbb 
This prevents writing incorrect history (empty).
@bedevere-app bedevere-app bot mentioned this pull request Jul 2, 2024
Closed
@skirpichev
Copy link
Contributor Author

CC @pablogsal

vstinner
vstinner reviewed Jul 2, 2024
View reviewed changes
vstinner
vstinner approved these changes Jul 2, 2024
View reviewed changes
Copy link
Member
@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM if you remove the comment.

@skirpichev skirpichev changed the title gh-121245: Amend 38cfa9288 (correct import) gh-121245: Amend d611c4c8e9 (correct import) Jul 2, 2024
skirpichev
skirpichev commented Jul 2, 2024
View reviewed changes
@skirpichev
Copy link
Contributor Author
skirpichev commented Jul 2, 2024 •
edited
Loading

BTW, test in write_history() looks asymmetrical wrt reading the history file. Maybe it should be moved up to fill some variable like using_base_repl?

That wasn't included, I did just minimal changes.

Edit: title was corrected, now its referenced commit in the main, not on 3.13.

@skirpichev @hroncok
Update Misc/NEWS.d/next/Library/2024-07-02-11-34-06.gh-issue-121245.s…
877f766 
…SkDAr.rst

Co-authored-by: Miro Hrončok <miro@hroncok.cz>
@ambv ambv enabled auto-merge (squash) July 2, 2024 09:33
@ambv ambv added the needs backport to 3.13 bugs and security fixes label Jul 2, 2024
@ambv ambv merged commit 7a807c3 into python:main Jul 2, 2024
34 checks passed
@miss-islington-app
Copy link

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

hroncok added a commit to fedora-python/cpython that referenced t 8000 his pull request Jul 2, 2024
@skirpichev @hroncok
00430: pythongh-121245: Amend d611c4c (correct import) (python#121255)
2a8f4aa 
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
@skirpichev skirpichev deleted the fix-repl-121245 branch July 2, 2024 09:45
@ambv ambv added needs backport to 3.13 bugs and security fixes and removed needs backport to 3.13 bugs and security fixes labels Jul 2, 2024
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 2, 2024
@skirpichev @hroncok @miss-islington
pythongh-121245: Amend d611c4c (correct import) (pythonGH-121255)
c22f56f 
(cherry picked from commit 7a807c3)

Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
@bedevere-app
Copy link
bedevere-app bot commented Jul 2, 2024

GH-121261 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 Jul 2, 2024
lysnikolaou pushed a commit that referenced this pull request Jul 2, 2024
@miss-islington @skirpichev @hroncok
[3.13] gh-121245: Correct pyrepl import in site.py (GH-121255) (#121261)
78e96bd 
(cherry picked from commit 7a807c3)

Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
@hroncok hroncok mentioned this pull request Jul 2, 2024
Merged
Akasurde pushed a commit to Akasurde/cpython that referenced this pull request Jul 3, 2024
@skirpichev @hroncok @Akasurde
pythongh-121245: Amend d611c4c (correct import) (python#121255)
039ae8d 
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024
@skirpichev @hroncok @noahbkim
pythongh-121245: Amend d611c4c (correct import) (python#121255)
b8a80ab 
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
@skirpichev @hroncok @estyxx < 7C8E /div>
pythongh-121245: Amend d611c4c (correct import) (python#121255)
5020c77 
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

@hroncok hroncok hroncok approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@skirpichev @vstinner @hroncok @ambv
0