##// END OF EJS Templates
Merge pull request #10481 from ipython/auto-backport-of-pr-10479...
Thomas Kluyver -
r23574:236dfede merge
parent child Browse files
Show More
@@ -64,6 +64,7 b' class TerminalPdb(Pdb):'
64 mouse_support=self.shell.mouse_support,
64 mouse_support=self.shell.mouse_support,
65 get_prompt_tokens=get_prompt_tokens,
65 get_prompt_tokens=get_prompt_tokens,
66 display_completions_in_columns=multicolumn,
66 display_completions_in_columns=multicolumn,
67 style=self.shell.style
67 )
68 )
68 self.pt_cli = CommandLineInterface(self._pt_app, eventloop=self.shell._eventloop)
69 self.pt_cli = CommandLineInterface(self._pt_app, eventloop=self.shell._eventloop)
69
70
@@ -243,7 +243,7 b' class TerminalInteractiveShell(InteractiveShell):'
243 last_cell = cell
243 last_cell = cell
244
244
245 self._style = self._make_style_from_name_or_cls(self.highlighting_style)
245 self._style = self._make_style_from_name_or_cls(self.highlighting_style)
246 style = DynamicStyle(lambda: self._style)
246 self.style = DynamicStyle(lambda: self._style)
247
247
248 editing_mode = getattr(EditingMode, self.editing_mode.upper())
248 editing_mode = getattr(EditingMode, self.editing_mode.upper())
249
249
@@ -257,7 +257,7 b' class TerminalInteractiveShell(InteractiveShell):'
257 completer=IPythonPTCompleter(shell=self,
257 completer=IPythonPTCompleter(shell=self,
258 patch_stdout=patch_stdout),
258 patch_stdout=patch_stdout),
259 enable_history_search=True,
259 enable_history_search=True,
260 style=style,
260 style=self.style,
261 mouse_support=self.mouse_support,
261 mouse_support=self.mouse_support,
262 **self._layout_options()
262 **self._layout_options()
263 )
263 )
General Comments 0
You need to be logged in to leave comments. Login now