]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-41193: Ignore OSError in readline write_history() (GH-21279)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 2 Jul 2020 11:02:08 +0000 (04:02 -0700)
committerGitHub <noreply@github.com>
Thu, 2 Jul 2020 11:02:08 +0000 (04:02 -0700)
The write_history() atexit function of the readline completer now
ignores any OSError to ignore error if the filesystem is read-only,
instead of only ignoring FileNotFoundError and PermissionError.
(cherry picked from commit 0ab917e07ed64c6bfde6f6e791f9b28acc97b510)

Co-authored-by: Victor Stinner <vstinner@python.org>
Lib/site.py
Misc/NEWS.d/next/Library/2020-07-02-11-53-45.bpo-41193.8-Tnql.rst [new file with mode: 0644]

index a065ab0b5db58f4e96f5925ec60424525594b908..9fa21cca3866747ab3e074777e90e497c35a348d 100644 (file)
@@ -444,9 +444,9 @@ def enablerlcompleter():
             def write_history():
                 try:
                     readline.write_history_file(history)
-                except (FileNotFoundError, PermissionError):
-                    # home directory does not exist or is not writable
-                    # https://bugs.python.org/issue19891
+                except OSError:
+                    # bpo-19891, bpo-41193: Home directory does not exist
+                    # or is not writable, or the filesystem is read-only.
                     pass
 
             atexit.register(write_history)
diff --git a/Misc/NEWS.d/next/Library/2020-07-02-11-53-45.bpo-41193.8-Tnql.rst b/Misc/NEWS.d/next/Library/2020-07-02-11-53-45.bpo-41193.8-Tnql.rst
new file mode 100644 (file)
index 0000000..8807d9c
--- /dev/null
@@ -0,0 +1,4 @@
+The ``write_history()`` atexit function of the readline completer now
+ignores any :exc:`OSError` to ignore error if the filesystem is read-only,
+instead of only ignoring :exc:`FileNotFoundError` and
+:exc:`PermissionError`.