[Python-checkins] python/dist/src/Lib/idlelib NEWS.txt, 1.57, 1.58 PyShell.py, 1.95, 1.96 rpc.py, 1.31, 1.32

kbk@users.sourceforge.net kbk at users.sourceforge.net
Tue May 10 05:44:26 CEST 2005


Update of /cvsroot/python/python/dist/src/Lib/idlelib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16006

Modified Files:
	NEWS.txt PyShell.py rpc.py 
Log Message:
Improve subprocess link error notification
M NEWS.txt
M PyShell.py
M rpc.py


Index: NEWS.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- NEWS.txt	5 May 2005 23:29:54 -0000	1.57
+++ NEWS.txt	10 May 2005 03:44:24 -0000	1.58
@@ -3,6 +3,8 @@
 
 *Release date: XX-XXX-2005*
 
+- Improve subprocess link error notification.
+
 - run.py: use Queue's blocking feature instead of sleeping in the main
   loop.  Patch # 1190163 Michiel de Hoon
 

Index: PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- PyShell.py	19 Jan 2005 00:22:58 -0000	1.95
+++ PyShell.py	10 May 2005 03:44:24 -0000	1.96
@@ -596,6 +596,8 @@
                 self.write("Unsupported characters in input")
                 return
         try:
+            # InteractiveInterpreter.runsource() calls its runcode() method,
+            # which is overridden (see below)
             return InteractiveInterpreter.runsource(self, source, filename)
         finally:
             if self.save_warnings_filters is not None:
@@ -720,6 +722,7 @@
                 else:
                     self.showtraceback()
             except:
+                print>>sys.stderr, "IDLE internal error in runcode()"
                 self.showtraceback()
         finally:
             if not use_subprocess:

Index: rpc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/rpc.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- rpc.py	23 Dec 2004 04:39:55 -0000	1.31
+++ rpc.py	10 May 2005 03:44:24 -0000	1.32
@@ -330,9 +330,10 @@
             try:
                 r, w, x = select.select([], [self.sock], [])
                 n = self.sock.send(s[:BUFSIZE])
-            except (AttributeError, socket.error):
-                # socket was closed
-                raise IOError
+            except (AttributeError, TypeError):
+                raise IOError, "socket no longer exists"
+            except socket.error:
+                raise
             else:
                 s = s[n:]
 



More information about the Python-checkins mailing list