bpo-14916: use specified tokenizer fd for file input (GH-31006)

miss-islington · pmp-p · web-flow · commit 91e888904478 · 2022-02-03T15:32:22.000-08:00
@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>
diff --git a/Misc/NEWS.d/next/C API/2020-09-11-02-50-41.bpo-14916.QN1Y03.rst b/Misc/NEWS.d/next/C API/2020-09-11-02-50-41.bpo-14916.QN1Y03.rst
@@ -0,0 +1 @@
+Fixed bug in the tokenizer that prevented ``PyRun_InteractiveOne`` from parsing from the provided FD.
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
@@ -854,7 +854,7 @@ tok_underflow_interactive(struct tok_state *tok) {
         tok->done = E_INTERACT_STOP;
         return 1;
     }
-    char *newtok = PyOS_Readline(stdin, stdout, tok->prompt);
+    char *newtok = PyOS_Readline(tok->fp ? tok->fp : stdin, stdout, tok->prompt);
     if (newtok != NULL) {
         char *translated = translate_newlines(newtok, 0, tok);
         PyMem_Free(newtok);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed bug in the tokenizer that prevented ``PyRun_InteractiveOne`` from parsing from the provided FD.
Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ tok_underflow_interactive(struct tok_state *tok) {`
`854`	`854`	`tok->done = E_INTERACT_STOP;`
`855`	`855`	`return 1;`
`856`	`856`	`}`
`857`		`- char *newtok = PyOS_Readline(stdin, stdout, tok->prompt);`
	`857`	`+ char *newtok = PyOS_Readline(tok->fp ? tok->fp : stdin, stdout, tok->prompt);`
`858`	`858`	`if (newtok != NULL) {`
`859`	`859`	`char *translated = translate_newlines(newtok, 0, tok);`
`860`	`860`	`PyMem_Free(newtok);`