[Idle-dev] CVS: idle PyShell.py,1.57,1.58 rpc.py,1.17,1.18

Kurt B. Kaiser kbk@users.sourceforge.net
Mon, 10 Mar 2003 12:42:35 -0800


Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv21021

Modified Files:
	PyShell.py rpc.py 
Log Message:
M PyShell.py
M rpc.py
Improve exception handing if peer process has terminated.


Index: PyShell.py
===================================================================
RCS file: /cvsroot/idlefork/idle/PyShell.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** PyShell.py	4 Mar 2003 04:03:45 -0000	1.57
--- PyShell.py	10 Mar 2003 20:42:22 -0000	1.58
***************
*** 401,405 ****
          except ImportError:
              SIGINT = 2
!         os.kill(self.rpcpid, SIGINT)
  
      def __request_interrupt(self):
--- 401,408 ----
          except ImportError:
              SIGINT = 2
!         try:
!             os.kill(self.rpcpid, SIGINT)
!         except OSError:    # subprocess may have already exited
!             pass
  
      def __request_interrupt(self):

Index: rpc.py
===================================================================
RCS file: /cvsroot/idlefork/idle/rpc.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** rpc.py	27 Feb 2003 23:04:15 -0000	1.17
--- rpc.py	10 Mar 2003 20:42:24 -0000	1.18
***************
*** 167,170 ****
--- 167,172 ----
          except SystemExit:
              raise
+         except socket.error:
+             pass
          except:
              self.debug("localcall:EXCEPTION")