Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 14:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

M PyShell.py

Browse source 
1. Format and print exceptions raised in user code.

M rpc.py
1. Additional debug messages in rpc.py
2. Move debug message enable switch from SocketIO to Client and Server
   to allow separate activation.
3. Add indication of origin (client or server) to debug message
4. Add sequence number to appropriate debug messages

5. Pass string exception arg as a string rather than a tuple.
This commit is contained in:
Kurt B. Kaiser 2002-12-06 21:45:24 +00:00
parent edb635ff5c
commit 0930c43e43
2 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/idlelib/PyShell.py
View file

@ -11,6 +11,7 @@
import traceback import traceback
import types import types
import warnings import warnings
import exceptions
import linecache import linecache
from code import InteractiveInterpreter from code import InteractiveInterpreter
@ -340,6 +341,7 @@ def poll_subprocess(self):
if clt is None: if clt is None:
return return
response = clt.pollresponse(self.active_seq) response = clt.pollresponse(self.active_seq)
# Reschedule myself in 50 ms
self.tkconsole.text.after(50, self.poll_subprocess) self.tkconsole.text.after(50, self.poll_subprocess)
if response: if response:
self.tkconsole.resetoutput() self.tkconsole.resetoutput()
@ -362,14 +364,24 @@ def poll_subprocess(self):
line = linecache.getline(fn, ln) line = linecache.getline(fn, ln)
tb[i] = fn, ln, nm, line tb[i] = fn, ln, nm, line
traceback.print_list(tb, file=file) traceback.print_list(tb, file=file)
if mod and mod != "exceptions": # try to reinstantiate the exception, stuff in the args:
name = mod + "." + name try:
print >>file, name + ":", " ".join(map(str, args)) etype = eval(mod + '.' + name)
val = etype()
val.args = args
except TypeError: # string exception!
etype = name
val = args
lines = traceback.format_exception_only(etype, val)
for line in lines[:-1]:
traceback._print(file, line, '')
traceback._print(file, lines[-1], '')
if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"): if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"):
self.remote_stack_viewer() self.remote_stack_viewer()
elif how == "ERROR": elif how == "ERROR":
print >>sys.__stderr__, "Oops:", how, what errmsg = "PyShell.ModifiedInterpreter: Subprocess ERROR:\n"
print >>file, "Oops:", how, what print >>sys.__stderr__, errmsg, what
print >>file, errmsg, what
self.tkconsole.endexecuting() self.tkconsole.endexecuting()
def kill_subprocess(self): def kill_subprocess(self):
@ -416,6 +428,8 @@ def execfile(self, filename, source=None):
code = compile(source, filename, "exec") code = compile(source, filename, "exec")
except (OverflowError, SyntaxError): except (OverflowError, SyntaxError):
self.tkconsole.resetoutput() self.tkconsole.resetoutput()
console = self.tkconsole.console
print >>console, 'Traceback (most recent call last):'
InteractiveInterpreter.showsyntaxerror(self, filename) InteractiveInterpreter.showsyntaxerror(self, filename)
self.tkconsole.showprompt() self.tkconsole.showprompt()
else: else:

35
Lib/idlelib/rpc.py
View file

@ -90,8 +90,6 @@ def get_request(self):
class SocketIO: class SocketIO:
debugging = False
def __init__(self, sock, objtable=None, debugging=None): def __init__(self, sock, objtable=None, debugging=None):
self.mainthread = threading.currentThread() self.mainthread = threading.currentThread()
if debugging is not None: if debugging is not None:
@ -113,11 +111,10 @@ def close(self):
def debug(self, *args): def debug(self, *args):
if not self.debugging: if not self.debugging:
return return
s = str(threading.currentThread().getName()) s = self.location + " " + str(threading.currentThread().getName())
for a in args: for a in args:
s = s + " " + str(a) s = s + " " + str(a)
s = s + "\n" print>>sys.__stderr__, s
sys.__stderr__.write(s)
def register(self, oid, object): def register(self, oid, object):
self.objtable[oid] = object self.objtable[oid] = object
@ -159,7 +156,7 @@ def localcall(self, request):
typ, val, tb = info = sys.exc_info() typ, val, tb = info = sys.exc_info()
sys.last_type, sys.last_value, sys.last_traceback = info sys.last_type, sys.last_value, sys.last_traceback = info
if isinstance(typ, type(Exception)): if isinstance(typ, type(Exception)):
# Class exceptions # Class exception
mod = typ.__module__ mod = typ.__module__
name = typ.__name__ name = typ.__name__
if issubclass(typ, Exception): if issubclass(typ, Exception):
@ -167,29 +164,29 @@ def localcall(self, request):
else: else:
args = (str(val),) args = (str(val),)
else: else:
# String exceptions # User string exception
mod = None mod = None
name = typ name = typ
args = (str(val),) if val is None: val = ''
args = str(val)
tb = traceback.extract_tb(tb) tb = traceback.extract_tb(tb)
self.debug("localcall:EXCEPTION: ", mod, name, args, tb)
return ("EXCEPTION", (mod, name, args, tb)) return ("EXCEPTION", (mod, name, args, tb))
def remotecall(self, oid, methodname, args, kwargs): def remotecall(self, oid, methodname, args, kwargs):
self.debug("remotecall:", oid, methodname, args, kwargs) self.debug("remotecall:")
seq = self.asynccall(oid, methodname, args, kwargs) seq = self.asynccall(oid, methodname, args, kwargs)
ret = self.asyncreturn(seq) return self.asyncreturn(seq)
self.debug("return:", ret)
return ret
def asynccall(self, oid, methodname, args, kwargs): def asynccall(self, oid, methodname, args, kwargs):
self.debug("asyncall:", oid, methodname, args, kwargs)
request = ("call", (oid, methodname, args, kwargs)) request = ("call", (oid, methodname, args, kwargs))
seq = self.putrequest(request) seq = self.putrequest(request)
self.debug(("asyncall:%d:" % seq), oid, methodname, args, kwargs)
return seq return seq
def asyncreturn(self, seq): def asyncreturn(self, seq):
response = self.getresponse(seq) response = self.getresponse(seq)
self.debug("asyncreturn:", response) self.debug(("asyncreturn:%d:" % seq), response)
return self.decoderesponse(response) return self.decoderesponse(response)
def decoderesponse(self, response): def decoderesponse(self, response):
@ -197,6 +194,7 @@ def decoderesponse(self, response):
if how == "OK": if how == "OK":
return what return what
if how == "EXCEPTION": if how == "EXCEPTION":
self.debug("decoderesponse: Internal EXCEPTION:", what)
mod, name, args, tb = what mod, name, args, tb = what
self.traceback = tb self.traceback = tb
if mod: # not string exception if mod: # not string exception
@ -217,6 +215,7 @@ def decoderesponse(self, response):
# do the best we can: # do the best we can:
raise name, args raise name, args
if how == "ERROR": if how == "ERROR":
self.debug("decoderesponse: Internal ERROR:", what)
raise RuntimeError, what raise RuntimeError, what
raise SystemError, (how, what) raise SystemError, (how, what)
@ -274,6 +273,7 @@ def newseq(self):
return seq return seq
def putmessage(self, message): def putmessage(self, message):
##self.debug("putmessage: ", message)
try: try:
s = pickle.dumps(message) s = pickle.dumps(message)
except: except:
@ -345,6 +345,7 @@ def pollresponse(self, myseq, wait=0.0):
wait = 0.0 wait = 0.0
seq, resq = message seq, resq = message
if resq[0] == "call": if resq[0] == "call":
self.debug("call_localcall:%d:" % seq)
response = self.localcall(resq) response = self.localcall(resq)
self.putmessage((seq, response)) self.putmessage((seq, response))
continue continue
@ -377,7 +378,8 @@ def __init__(self, oid):
class RPCHandler(SocketServer.BaseRequestHandler, SocketIO): class RPCHandler(SocketServer.BaseRequestHandler, SocketIO):
debugging = 0 debugging = False
location = "#S" # Server
def __init__(self, sock, addr, svr): def __init__(self, sock, addr, svr):
svr.current_handler = self ## cgt xxx svr.current_handler = self ## cgt xxx
@ -393,6 +395,9 @@ def get_remote_proxy(self, oid):
class RPCClient(SocketIO): class RPCClient(SocketIO):
debugging = False
location = "#C" # Client
nextseq = 1 # Requests coming from the client are odd numbered nextseq = 1 # Requests coming from the client are odd numbered
def __init__(self, address, family=socket.AF_INET, type=socket.SOCK_STREAM): def __init__(self, address, family=socket.AF_INET, type=socket.SOCK_STREAM):