From b24bd658f76e29a8e8336cc8d9c7a80e07117520 2011-04-10 04:20:28 From: Thomas Kluyver Date: 2011-04-10 04:20:28 Subject: [PATCH] %reset doesn't reset prompt number. --- diff --git a/IPython/core/history.py b/IPython/core/history.py index 21c736b..f64f4d3 100644 --- a/IPython/core/history.py +++ b/IPython/core/history.py @@ -164,15 +164,15 @@ class HistoryManager(Configurable): def reset(self, new_session=True): """Clear the session history, releasing all object references, and optionally open a new session.""" - if self.session_number: - self.end_session() - self.input_hist_parsed[:] = [""] - self.input_hist_raw[:] = [""] self.output_hist.clear() # The directory history can't be completely empty self.dir_hist[:] = [os.getcwd()] if new_session: + if self.session_number: + self.end_session() + self.input_hist_parsed[:] = [""] + self.input_hist_raw[:] = [""] self.new_session() ## ------------------------------- diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index ec01d4d..5af556b 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -1045,12 +1045,12 @@ class InteractiveShell(Configurable, Magic): """ # Clear histories self.history_manager.reset(new_session) + # Reset counter used to index all histories + if new_session: + self.execution_count = 1 # Flush cached output items self.displayhook.flush() - - # Reset counter used to index all histories - self.execution_count = 0 # Restore the user namespaces to minimal usability for ns in self.ns_refs_table: diff --git a/IPython/core/magic.py b/IPython/core/magic.py index aad591c..042618b 100644 --- a/IPython/core/magic.py +++ b/IPython/core/magic.py @@ -1007,7 +1007,7 @@ Currently the magic system has the following functions:\n""" del(user_ns[i]) else: # Hard reset - self.shell.reset(new_session = True) + self.shell.reset(new_session = False)