From 5d23e6d54352db7c64d152dbabef798340127ccb Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sun, 29 Sep 2013 22:18:38 +0200 Subject: [PATCH] Issue #5845: In site.py, only load readline history from ~/.python_history if no history has been read already. This avoids double writes to the history file at shutdown. --- Lib/site.py | 19 +++++++++++++------ Misc/NEWS | 4 ++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Lib/site.py b/Lib/site.py index 9f935a3c7e..e1fa30eacd 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -405,12 +405,19 @@ def enablerlcompleter(): # want to ignore the exception. pass - history = os.path.join(os.path.expanduser('~'), '.python_history') - try: - readline.read_history_file(history) - except IOError: - pass - atexit.register(readline.write_history_file, history) + if readline.get_history_item(1) is None: + # If no history was loaded, default to .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 = os.path.join(os.path.expanduser('~'), + '.python_history') + try: + readline.read_history_file(history) + except IOError: + pass + atexit.register(readline.write_history_file, history) sys.__interactivehook__ = register_readline diff --git a/Misc/NEWS b/Misc/NEWS index 8974c4b89f..8e28b017aa 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,10 @@ Core and Builtins Library ------- +- Issue #5845: In site.py, only load readline history from ~/.python_history + if no history has been read already. This avoids double writes to the + history file at shutdown. + - Properly initialize all fields of a SSL object after allocation. - Issue #19095: SSLSocket.getpeercert() now raises ValueError when the -- 2.50.0