From 7d6edcbdb7b8e2adfc1e681c0eea9cfa5ac6e2bc 2011-10-16 22:00:13
From: Julian Taylor <jtaylor.debian@googlemail.com>
Date: 2011-10-16 22:00:13
Subject: [PATCH] clarify variable names

---

diff --git a/IPython/frontend/terminal/interactiveshell.py b/IPython/frontend/terminal/interactiveshell.py
index d594900..c34f32d 100644
--- a/IPython/frontend/terminal/interactiveshell.py
+++ b/IPython/frontend/terminal/interactiveshell.py
@@ -229,11 +229,11 @@ class TerminalInteractiveShell(InteractiveShell):
                     # handling seems rather unpredictable...
                     self.write("\nKeyboardInterrupt in interact()\n")
 
-    def _store_multiline_history(self, source_raw, orig_hlen):
+    def _replace_rlhist_multiline(self, source_raw, hlen_before_cell):
         """Store multiple lines as a single entry in history"""
         if self.multiline_history and self.has_readline:
             hlen = self.readline.get_current_history_length()
-            for i in range(hlen - orig_hlen):
+            for i in range(hlen - hlen_before_cell):
                 self.readline.remove_history_item(hlen - i - 1)
             self.readline.add_history(source_raw.rstrip())
 
@@ -253,7 +253,7 @@ class TerminalInteractiveShell(InteractiveShell):
             self.show_banner()
 
         more = False
-        hlen = self.readline.get_current_history_length()
+        hlen_before_cell = self.readline.get_current_history_length()
 
         # Mark activity in the builtins
         __builtin__.__dict__['__IPYTHON__active'] += 1
@@ -291,8 +291,8 @@ class TerminalInteractiveShell(InteractiveShell):
                 try:
                     self.write('\nKeyboardInterrupt\n')
                     source_raw = self.input_splitter.source_raw_reset()[1]
-                    self._store_multiline_history(source_raw, hlen)
-                    hlen = self.readline.get_current_history_length()
+                    self._replace_rlhist_multiline(source_raw, hlen_before_cell)
+                    hlen_before_cell = self.readline.get_current_history_length()
                     more = False
                 except KeyboardInterrupt:
                     pass
@@ -320,8 +320,8 @@ class TerminalInteractiveShell(InteractiveShell):
                     self.edit_syntax_error()
                 if not more:
                     source_raw = self.input_splitter.source_raw_reset()[1]
-                    self._store_multiline_history(source_raw, hlen)
-                    hlen = self.readline.get_current_history_length()
+                    self._replace_rlhist_multiline(source_raw, hlen_before_cell)
+                    hlen_before_cell = self.readline.get_current_history_length()
                     self.run_cell(source_raw, store_history=True)
 
         # We are off again...