mirror of https://github.com/python/cpython
Modify the remote stack viewer to work in the threaded subprocess.
M PyShell.py M run.py
This commit is contained in:
parent
5da131b2df
commit
9f36609720
|
@ -357,6 +357,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
|||
self.rpcclt.register("stderr", self.tkconsole.stderr)
|
||||
self.rpcclt.register("flist", self.tkconsole.flist)
|
||||
self.rpcclt.register("linecache", linecache)
|
||||
self.rpcclt.register("interp", self)
|
||||
self.transfer_path()
|
||||
self.poll_subprocess()
|
||||
|
||||
|
@ -480,6 +481,19 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
|||
def getdebugger(self):
|
||||
return self.debugger
|
||||
|
||||
def open_remote_stack_viewer(self):
|
||||
"""Initiate the remote stack viewer from a separate thread.
|
||||
|
||||
This method is called from the subprocess, and by returning from this
|
||||
method we allow the subprocess to unblock. After a bit the shell
|
||||
requests the subprocess to open the remote stack viewer which returns a
|
||||
static object looking at the last exceptiopn. It is queried through
|
||||
the RPC mechanism.
|
||||
|
||||
"""
|
||||
self.tkconsole.text.after(300, self.remote_stack_viewer)
|
||||
return
|
||||
|
||||
def remote_stack_viewer(self):
|
||||
import RemoteObjectBrowser
|
||||
oid = self.rpcclt.remotequeue("exec", "stackviewer", ("flist",), {})
|
||||
|
|
|
@ -207,9 +207,10 @@ class MyHandler(rpc.RPCHandler):
|
|||
"""Override base method"""
|
||||
executive = Executive(self)
|
||||
self.register("exec", executive)
|
||||
sys.stdin = self.get_remote_proxy("stdin")
|
||||
sys.stdin = self.console = self.get_remote_proxy("stdin")
|
||||
sys.stdout = self.get_remote_proxy("stdout")
|
||||
sys.stderr = self.get_remote_proxy("stderr")
|
||||
self.interp = self.get_remote_proxy("interp")
|
||||
rpc.RPCHandler.getresponse(self, myseq=None, wait=0.05)
|
||||
|
||||
def exithook(self):
|
||||
|
@ -238,12 +239,17 @@ class Executive:
|
|||
|
||||
def runcode(self, code):
|
||||
try:
|
||||
self.usr_exc_info = None
|
||||
exec code in self.locals
|
||||
except:
|
||||
self.usr_exc_info = sys.exc_info()
|
||||
if quitting:
|
||||
exit()
|
||||
# even print a user code SystemExit exception, continue
|
||||
print_exception()
|
||||
jit = self.rpchandler.console.getvar("<<toggle-jit-stack-viewer>>")
|
||||
if jit:
|
||||
self.rpchandler.interp.open_remote_stack_viewer()
|
||||
else:
|
||||
flush_stdout()
|
||||
|
||||
|
@ -261,13 +267,16 @@ class Executive:
|
|||
return self.calltip.fetch_tip(name)
|
||||
|
||||
def stackviewer(self, flist_oid=None):
|
||||
if not hasattr(sys, "last_traceback"):
|
||||
if self.usr_exc_info:
|
||||
typ, val, tb = self.usr_exc_info
|
||||
else:
|
||||
return None
|
||||
flist = None
|
||||
if flist_oid is not None:
|
||||
flist = self.rpchandler.get_remote_proxy(flist_oid)
|
||||
tb = sys.last_traceback
|
||||
while tb and tb.tb_frame.f_globals["__name__"] in ["rpc", "run"]:
|
||||
tb = tb.tb_next
|
||||
sys.last_type = typ
|
||||
sys.last_value = val
|
||||
item = StackViewer.StackTreeItem(flist, tb)
|
||||
return RemoteObjectBrowser.remote_object_tree_item(item)
|
||||
|
|
Loading…
Reference in New Issue