##// END OF EJS Templates
Add frame parameter to terminal debugger.
tillahoffmann -
Show More
@@ -1,82 +1,90 b''
1 from IPython.core.debugger import Pdb
1 from IPython.core.debugger import Pdb
2
2
3 from IPython.core.completer import IPCompleter
3 from IPython.core.completer import IPCompleter
4 from .ptutils import IPythonPTCompleter
4 from .ptutils import IPythonPTCompleter
5
5
6 from prompt_toolkit.token import Token
6 from prompt_toolkit.token import Token
7 from prompt_toolkit.shortcuts import create_prompt_application
7 from prompt_toolkit.shortcuts import create_prompt_application
8 from prompt_toolkit.interface import CommandLineInterface
8 from prompt_toolkit.interface import CommandLineInterface
9 from prompt_toolkit.enums import EditingMode
9 from prompt_toolkit.enums import EditingMode
10 import sys
11
10
12
11 class TerminalPdb(Pdb):
13 class TerminalPdb(Pdb):
12 def __init__(self, *args, **kwargs):
14 def __init__(self, *args, **kwargs):
13 Pdb.__init__(self, *args, **kwargs)
15 Pdb.__init__(self, *args, **kwargs)
14 self._ptcomp = None
16 self._ptcomp = None
15 self.pt_init()
17 self.pt_init()
16
18
17 def pt_init(self):
19 def pt_init(self):
18 def get_prompt_tokens(cli):
20 def get_prompt_tokens(cli):
19 return [(Token.Prompt, self.prompt)]
21 return [(Token.Prompt, self.prompt)]
20
22
21 if self._ptcomp is None:
23 if self._ptcomp is None:
22 compl = IPCompleter(shell=self.shell,
24 compl = IPCompleter(shell=self.shell,
23 namespace={},
25 namespace={},
24 global_namespace={},
26 global_namespace={},
25 use_readline=False,
27 use_readline=False,
26 parent=self.shell,
28 parent=self.shell,
27 )
29 )
28 self._ptcomp = IPythonPTCompleter(compl)
30 self._ptcomp = IPythonPTCompleter(compl)
29
31
30 self._pt_app = create_prompt_application(
32 self._pt_app = create_prompt_application(
31 editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
33 editing_mode=getattr(EditingMode, self.shell.editing_mode.upper()),
32 history=self.shell.debugger_history,
34 history=self.shell.debugger_history,
33 completer= self._ptcomp,
35 completer= self._ptcomp,
34 enable_history_search=True,
36 enable_history_search=True,
35 mouse_support=self.shell.mouse_support,
37 mouse_support=self.shell.mouse_support,
36 get_prompt_tokens=get_prompt_tokens
38 get_prompt_tokens=get_prompt_tokens
37 )
39 )
38 self.pt_cli = CommandLineInterface(self._pt_app, eventloop=self.shell._eventloop)
40 self.pt_cli = CommandLineInterface(self._pt_app, eventloop=self.shell._eventloop)
39
41
40 def cmdloop(self, intro=None):
42 def cmdloop(self, intro=None):
41 """Repeatedly issue a prompt, accept input, parse an initial prefix
43 """Repeatedly issue a prompt, accept input, parse an initial prefix
42 off the received input, and dispatch to action methods, passing them
44 off the received input, and dispatch to action methods, passing them
43 the remainder of the line as argument.
45 the remainder of the line as argument.
44
46
45 override the same methods from cmd.Cmd to provide prompt toolkit replacement.
47 override the same methods from cmd.Cmd to provide prompt toolkit replacement.
46 """
48 """
47 if not self.use_rawinput:
49 if not self.use_rawinput:
48 raise ValueError('Sorry ipdb does not support use_rawinput=False')
50 raise ValueError('Sorry ipdb does not support use_rawinput=False')
49
51
50 self.preloop()
52 self.preloop()
51
53
52 try:
54 try:
53 if intro is not None:
55 if intro is not None:
54 self.intro = intro
56 self.intro = intro
55 if self.intro:
57 if self.intro:
56 self.stdout.write(str(self.intro)+"\n")
58 self.stdout.write(str(self.intro)+"\n")
57 stop = None
59 stop = None
58 while not stop:
60 while not stop:
59 if self.cmdqueue:
61 if self.cmdqueue:
60 line = self.cmdqueue.pop(0)
62 line = self.cmdqueue.pop(0)
61 else:
63 else:
62 self._ptcomp.ipy_completer.namespace = self.curframe_locals
64 self._ptcomp.ipy_completer.namespace = self.curframe_locals
63 self._ptcomp.ipy_completer.global_namespace = self.curframe.f_globals
65 self._ptcomp.ipy_completer.global_namespace = self.curframe.f_globals
64 try:
66 try:
65 line = self.pt_cli.run(reset_current_buffer=True).text
67 line = self.pt_cli.run(reset_current_buffer=True).text
66 except EOFError:
68 except EOFError:
67 line = 'EOF'
69 line = 'EOF'
68 line = self.precmd(line)
70 line = self.precmd(line)
69 stop = self.onecmd(line)
71 stop = self.onecmd(line)
70 stop = self.postcmd(stop, line)
72 stop = self.postcmd(stop, line)
71 self.postloop()
73 self.postloop()
72 except Exception:
74 except Exception:
73 raise
75 raise
74
76
75 def set_trace():
77
76 TerminalPdb().set_trace()
78 def set_trace(frame=None):
79 """
80 Start debugging from `frame`.
81
82 If frame is not specified, debugging starts from caller's frame.
83 """
84 TerminalPdb().set_trace(frame or sys._getframe().f_back)
77
85
78
86
79 if __name__ == '__main__':
87 if __name__ == '__main__':
80 import pdb
88 import pdb
81 pdb.Pdb = TerminalPdb
89 pdb.Pdb = TerminalPdb
82 pdb.main()
90 pdb.main()
General Comments 0
You need to be logged in to leave comments. Login now