Commit379805d

authored

[3.14]gh-128066: Properly handle history file writes for RO fs on PyREPL (gh-134380) (gh-134385)

(cherry picked from commitc91ad5d)Co-authored-by: Chris Patti <feoh@feoh.org>Co-authored-by: Łukasz Langa <lukasz@langa.pl>

1 parent899ce7d commit379805dCopy full SHA for 379805d

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`importsys`
`32`	`32`	`importcode`
`33`	`33`	`importwarnings`
	`34`	`+importerrno`
`34`	`35`
`35`	`36`	`from .readlineimport_get_reader,multiline_input,append_history_file`
`36`	`37`
`@@ -153,6 +154,7 @@ def maybe_run_command(statement: str) -> bool:`
`153`	`154`	`append_history_file()`
`154`	`155`	`except (FileNotFoundError,PermissionError,OSError)ase:`
`155`	`156`	`warnings.warn(f"failed to open the history file for writing:{e}")`
	`157`	`+`
`156`	`158`	`input_n+=1`
`157`	`159`	`exceptKeyboardInterrupt:`
`158`	`160`	`r=_get_reader()`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@`
`75`	`75`	`import_sitebuiltins`
`76`	`76`	`import_ioasio`
`77`	`77`	`importstat`
	`78`	`+importerrno`
`78`	`79`
`79`	`80`	`# Prefixes for site-packages; add additional prefixes like /usr/local here`
`80`	`81`	`PREFIXES= [sys.prefix,sys.exec_prefix]`
`@@ -578,10 +579,15 @@ def register_readline():`
`578`	`579`	`defwrite_history():`
`579`	`580`	`try:`
`580`	`581`	`readline_module.write_history_file(history)`
`581`		`-except(FileNotFoundError,PermissionError):`
	`582`	`+exceptFileNotFoundError,PermissionError:`
`582`	`583`	`# home directory does not exist or is not writable`
`583`	`584`	`# https://bugs.python.org/issue19891`
`584`	`585`	`pass`
	`586`	`+exceptOSError:`
	`587`	`+iferrno.EROFS:`
	`588`	`+pass# gh-128066: read-only file system`
	`589`	`+else:`
	`590`	`+raise`
`585`	`591`
`586`	`592`	`atexit.register(write_history)`
`587`	`593`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Fixes an edge case where PyREPL improperly threw an error when Python is`
	`2`	`+invoked on a read only filesystem while trying to write history file`
	`3`	`+entries.`

Comments

(0)