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-14916: use specified tokenizer fd for file input #31006

Merged
merged 2 commits into from Feb 1, 2022
Merged

bpo-14916: use specified tokenizer fd for file input #31006

merged 2 commits into from Feb 1, 2022

Conversation

@pmp-p
Copy link
Contributor

@pmp-p pmp-p commented Jan 29, 2022 •
edited by miss-islington

@pablogsal, sorry i failed to rebase to main, so i recreated #22190 (comment)

PyRun_InteractiveOne*() functions allow to explicitily set fd instead of stdin.
but stdin was hardcoded in readline call.

This patch does not fix target file for prompt unlike original bpo one : prompt fd is unrelated to tokenizer source which could be read only. It is more of a bugfix regarding the docs : actual documentation say "prompt the user" so one would expect prompt to go on stdout not a file for both PyRun_InteractiveOne*() and PyRun_InteractiveLoop*().

https://bugs.python.org/issue14916

Automerge-Triggered-By: GH:pablogsal
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Feb 1, 2022

@pmp-p: Status check is done, and it's a success ✅ .

@miss-islington miss-islington merged commit 89b1304 into python:main Feb 1, 2022
12 checks passed
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Feb 1, 2022

Thanks @pmp-p for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

miss-islington added a commit to miss-islington/cpython that referenced this issue Feb 1, 2022
@pmp-p @miss-islington
bpo-14916: use specified tokenizer fd for file input (pythonGH-31006)
02bd441 
@pablogsal, sorry i failed to rebase to main, so i recreated https://github.com/python/cpython/pull/22190GH-issuecomment-1024633392

> PyRun_InteractiveOne\*() functions allow to explicitily set fd instead of stdin.
but stdin was hardcoded in readline call.

> This patch does not fix target file for prompt unlike original bpo one : prompt fd is unrelated to tokenizer source which could be read only. It is more of a bugfix regarding the docs :  actual documentation say "prompt the user" so one would expect prompt to go on stdout not a file for both PyRun_InteractiveOne\*() and PyRun_InteractiveLoop\*().

Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit 89b1304)

Co-authored-by: Paul m. p. P <mail.peny@free.fr>
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Feb 1, 2022

GH-31065 is a backport of this pull request to the 3.10 branch.

@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Feb 1, 2022

Sorry, @pmp-p, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 89b13042fcfc95bae21a49806a205ef62f1cdd73 3.9

@miss-islington miss-islington self-assigned this Feb 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogsal pablogsal

@lysnikolaou lysnikolaou

Assignees

@miss-islington miss-islington

Labels
CLA signed needs backport to 3.9 🤖 automerge
Projects
None yet
Milestone
No milestone
5 participants
@pmp-p @miss-islington @bedevere-bot @pablogsal @the-knights-who-say-ni