##// END OF EJS Templates
clarify variable names
Julian Taylor -
Show More
@@ -229,11 +229,11 b' class TerminalInteractiveShell(InteractiveShell):'
229 # handling seems rather unpredictable...
229 # handling seems rather unpredictable...
230 self.write("\nKeyboardInterrupt in interact()\n")
230 self.write("\nKeyboardInterrupt in interact()\n")
231
231
232 def _store_multiline_history(self, source_raw, orig_hlen):
232 def _replace_rlhist_multiline(self, source_raw, hlen_before_cell):
233 """Store multiple lines as a single entry in history"""
233 """Store multiple lines as a single entry in history"""
234 if self.multiline_history and self.has_readline:
234 if self.multiline_history and self.has_readline:
235 hlen = self.readline.get_current_history_length()
235 hlen = self.readline.get_current_history_length()
236 for i in range(hlen - orig_hlen):
236 for i in range(hlen - hlen_before_cell):
237 self.readline.remove_history_item(hlen - i - 1)
237 self.readline.remove_history_item(hlen - i - 1)
238 self.readline.add_history(source_raw.rstrip())
238 self.readline.add_history(source_raw.rstrip())
239
239
@@ -253,7 +253,7 b' class TerminalInteractiveShell(InteractiveShell):'
253 self.show_banner()
253 self.show_banner()
254
254
255 more = False
255 more = False
256 hlen = self.readline.get_current_history_length()
256 hlen_before_cell = self.readline.get_current_history_length()
257
257
258 # Mark activity in the builtins
258 # Mark activity in the builtins
259 __builtin__.__dict__['__IPYTHON__active'] += 1
259 __builtin__.__dict__['__IPYTHON__active'] += 1
@@ -291,8 +291,8 b' class TerminalInteractiveShell(InteractiveShell):'
291 try:
291 try:
292 self.write('\nKeyboardInterrupt\n')
292 self.write('\nKeyboardInterrupt\n')
293 source_raw = self.input_splitter.source_raw_reset()[1]
293 source_raw = self.input_splitter.source_raw_reset()[1]
294 self._store_multiline_history(source_raw, hlen)
294 self._replace_rlhist_multiline(source_raw, hlen_before_cell)
295 hlen = self.readline.get_current_history_length()
295 hlen_before_cell = self.readline.get_current_history_length()
296 more = False
296 more = False
297 except KeyboardInterrupt:
297 except KeyboardInterrupt:
298 pass
298 pass
@@ -320,8 +320,8 b' class TerminalInteractiveShell(InteractiveShell):'
320 self.edit_syntax_error()
320 self.edit_syntax_error()
321 if not more:
321 if not more:
322 source_raw = self.input_splitter.source_raw_reset()[1]
322 source_raw = self.input_splitter.source_raw_reset()[1]
323 self._store_multiline_history(source_raw, hlen)
323 self._replace_rlhist_multiline(source_raw, hlen_before_cell)
324 hlen = self.readline.get_current_history_length()
324 hlen_before_cell = self.readline.get_current_history_length()
325 self.run_cell(source_raw, store_history=True)
325 self.run_cell(source_raw, store_history=True)
326
326
327 # We are off again...
327 # We are off again...
General Comments 0
You need to be logged in to leave comments. Login now