Clean up ModifiedInterpreter.runcode() structure
This commit is contained in:
parent
ecf796ed43
commit
dddeb0eec4
@ -706,35 +706,37 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
|||||||
debugger = self.debugger
|
debugger = self.debugger
|
||||||
try:
|
try:
|
||||||
self.tkconsole.beginexecuting()
|
self.tkconsole.beginexecuting()
|
||||||
try:
|
if not debugger and self.rpcclt is not None:
|
||||||
if not debugger and self.rpcclt is not None:
|
self.active_seq = self.rpcclt.asyncqueue("exec", "runcode",
|
||||||
self.active_seq = self.rpcclt.asyncqueue("exec", "runcode",
|
(code,), {})
|
||||||
(code,), {})
|
elif debugger:
|
||||||
elif debugger:
|
debugger.run(code, self.locals)
|
||||||
debugger.run(code, self.locals)
|
else:
|
||||||
else:
|
exec code in self.locals
|
||||||
exec code in self.locals
|
except SystemExit:
|
||||||
except SystemExit:
|
if not self.tkconsole.closing:
|
||||||
if not self.tkconsole.closing:
|
if tkMessageBox.askyesno(
|
||||||
if tkMessageBox.askyesno(
|
"Exit?",
|
||||||
"Exit?",
|
"Do you want to exit altogether?",
|
||||||
"Do you want to exit altogether?",
|
default="yes",
|
||||||
default="yes",
|
master=self.tkconsole.text):
|
||||||
master=self.tkconsole.text):
|
|
||||||
raise
|
|
||||||
else:
|
|
||||||
self.showtraceback()
|
|
||||||
else:
|
|
||||||
raise
|
raise
|
||||||
except:
|
else:
|
||||||
if use_subprocess:
|
self.showtraceback()
|
||||||
# When run w/o subprocess, both user and IDLE errors
|
else:
|
||||||
# are printed here; skip message in that case.
|
raise
|
||||||
print >> self.tkconsole.stderr, \
|
except:
|
||||||
"IDLE internal error in runcode()"
|
if use_subprocess:
|
||||||
|
print >>self.tkconsole.stderr, \
|
||||||
|
"IDLE internal error in runcode()"
|
||||||
self.showtraceback()
|
self.showtraceback()
|
||||||
if use_subprocess:
|
self.tkconsole.endexecuting()
|
||||||
self.tkconsole.endexecuting()
|
else:
|
||||||
|
if self.tkconsole.canceled:
|
||||||
|
self.tkconsole.canceled = False
|
||||||
|
print >>self.tkconsole.stderr, "KeyboardInterrupt"
|
||||||
|
else:
|
||||||
|
self.showtraceback()
|
||||||
finally:
|
finally:
|
||||||
if not use_subprocess:
|
if not use_subprocess:
|
||||||
try:
|
try:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user