]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] gh-121245: Correct pyrepl import in site.py (GH-121255) (#121261)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 2 Jul 2024 11:40:05 +0000 (13:40 +0200)
committerGitHub <noreply@github.com>
Tue, 2 Jul 2024 11:40:05 +0000 (13:40 +0200)
(cherry picked from commit 7a807c3efaa83f1e4fb9b791579b47a0a1fd47de)

Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
Co-authored-by: Miro HronĨok <miro@hroncok.cz>
Lib/site.py
Misc/NEWS.d/next/Library/2024-07-02-11-34-06.gh-issue-121245.sSkDAr.rst [new file with mode: 0644]

index 7eace190f5ab21863cbca5bf76c2f859a1ccfc01..95c7ebf2fdf146f7bc569b8e6eef06edf0252aca 100644 (file)
@@ -526,8 +526,7 @@ def register_readline():
 
         def write_history():
             try:
-                # _pyrepl.__main__ is executed as the __main__ module
-                from __main__ import CAN_USE_PYREPL
+                from _pyrepl.main import CAN_USE_PYREPL
             except ImportError:
                 CAN_USE_PYREPL = False
 
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
new file mode 100644 (file)
index 0000000..6e9dec2
--- /dev/null
@@ -0,0 +1,2 @@
+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.