mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
M PyShell.py
M rpc.py Improve exception handing if peer process has terminated.
This commit is contained in:
parent
98b15ab980
commit
9ac783d723
2 changed files with 6 additions and 1 deletions
|
@ -400,7 +400,10 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
||||||
from signal import SIGINT
|
from signal import SIGINT
|
||||||
except ImportError:
|
except ImportError:
|
||||||
SIGINT = 2
|
SIGINT = 2
|
||||||
os.kill(self.rpcpid, SIGINT)
|
try:
|
||||||
|
os.kill(self.rpcpid, SIGINT)
|
||||||
|
except OSError: # subprocess may have already exited
|
||||||
|
pass
|
||||||
|
|
||||||
def __request_interrupt(self):
|
def __request_interrupt(self):
|
||||||
self.rpcclt.asynccall("exec", "interrupt_the_server", (), {})
|
self.rpcclt.asynccall("exec", "interrupt_the_server", (), {})
|
||||||
|
|
|
@ -166,6 +166,8 @@ class SocketIO:
|
||||||
return ("OK", ret)
|
return ("OK", ret)
|
||||||
except SystemExit:
|
except SystemExit:
|
||||||
raise
|
raise
|
||||||
|
except socket.error:
|
||||||
|
pass
|
||||||
except:
|
except:
|
||||||
self.debug("localcall:EXCEPTION")
|
self.debug("localcall:EXCEPTION")
|
||||||
traceback.print_exc(file=sys.__stderr__)
|
traceback.print_exc(file=sys.__stderr__)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue