python · pablogsal · Jul 3, 2024 · Jul 2, 2024 · Jul 2, 2024 · Jul 2, 2024
diff --git a/Lib/site.py b/Lib/site.py
@@ -509,35 +509,34 @@ def register_readline():
         pass
 
     if readline.get_current_history_length() == 0:
+        try:
+            from _pyrepl.main import CAN_USE_PYREPL
+        except ImportError:
+            CAN_USE_PYREPL = False
         # If no history was loaded, default to .python_history,
         # or PYTHON_HISTORY.
         # The guard is necessary to avoid doubling history size at
         # each interpreter exit when readline was already configured
         # through a PYTHONSTARTUP hook, see:
         # http://bugs.python.org/issue5845#msg198636
         history = gethistoryfile()
+        if os.getenv("PYTHON_BASIC_REPL") or not CAN_USE_PYREPL:
+            my_readline = readline
+        else:
+            my_readline = _pyrepl.readline
         try:
-            if os.getenv("PYTHON_BASIC_REPL"):
-                readline.read_history_file(history)
-            else:
-                _pyrepl.readline.read_history_file(history)
+            my_readline.read_history_file(history)
         except (OSError,* _pyrepl.unix_console._error):
             pass
 
         def write_history():
             try:
-                from _pyrepl.main import CAN_USE_PYREPL
-            except ImportError:
-                CAN_USE_PYREPL = False
-
-            try:
-                if os.getenv("PYTHON_BASIC_REPL") or not CAN_USE_PYREPL:
-                    readline.write_history_file(history)
-                else:
-                    _pyrepl.readline.write_history_file(history)
-            except (FileNotFoundError, PermissionError):
+                my_readline.write_history_file(history)
+            except (FileNotFoundError, PermissionError,
+                    _pyrepl.unix_console.InvalidTerminal):
                 # home directory does not exist or is not writable
                 # https://bugs.python.org/issue19891
+                # or terminal doesn't have the required capability
                 pass
 
         atexit.register(write_history)

@@ -1,14 +1,17 @@
 import io
 import itertools
 import os
+import pathlib
 import rlcompleter
 import select
 import subprocess
 import sys
+import tempfile
 from unittest import TestCase, skipUnless
 from unittest.mock import patch
 from test.support import force_not_colorized
 from test.support import SHORT_TIMEOUT
+from test.support.os_helper import unlink
 
 from .support import (
     FakeConsole,
@@ -898,6 +901,19 @@ def test_python_basic_repl(self):
         self.assertNotIn("Exception", output)
         self.assertNotIn("Traceback", output)
 
+    def test_not_wiping_history_file(self):
+        hfile = tempfile.NamedTemporaryFile(delete=False)
+        hfile.close
8000
()
+        self.addCleanup(unlink, hfile.name)
+        env = os.environ.copy()
+        env.update({"PYTHON_HISTORY": hfile.name})
+        commands = "123\nspam\nexit()\n"
+        output, exit_code = self.run_repl(commands, env=env)
+        self.assertEqual(exit_code, 0)
+        self.assertIn("123", output)
+        self.assertIn("spam", output)
+        self.assertNotEqual(pathlib.Path(hfile.name).stat().st_size, 0)
+
     def run_repl(self, repl_input: str | list[str], env: dict | None = None) -> tuple[str, int]:
         master_fd, slave_fd = pty.openpty()
         process = subprocess.Popen(

diff --git a/Misc/NEWS.d/next/Library/2024-07-02-11-34-06.gh-issue-121245.sSkDAr.rst b/Misc/NEWS.d/next/Library/2024-07-02-11-34-06.gh-issue-121245.sSkDAr.rst
@@ -1,2 +1,4 @@
-Fix a bug in the handling of the command history of the new :term:`REPL` that caused
-the history file to be wiped at REPL exit.
+Fix a bug in the handling of the command history of the new :term:`REPL` that
+caused the history file to be wiped at REPL exit.  ``site.register_readline()``
+helper was refactored to not clear history file if the command history is
+empty.  Patch by Sergey B Kirpichev.