[Zodb-checkins] CVS: ZODB3/ZEO/zrpc - connection.py:1.34

Guido van Rossum guido@python.org
Tue, 24 Sep 2002 08:48:02 -0400


Update of /cvs-repository/ZODB3/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv4435

Modified Files:
	connection.py 
Log Message:
Fix the control flow in pending().  Thanks to Ury Marshak!!!

Rather than blaming window for reporting success as an error, the
else clause on the second try block should be an except clause.


=== ZODB3/ZEO/zrpc/connection.py 1.33 => 1.34 ===
--- ZODB3/ZEO/zrpc/connection.py:1.33	Mon Sep 23 16:20:07 2002
+++ ZODB3/ZEO/zrpc/connection.py	Tue Sep 24 08:48:01 2002
@@ -400,9 +400,6 @@
             except select.error, err:
                 if err[0] == errno.EINTR:
                     continue
-                elif err[0] == 0:
-                    # Windows sez: "Error: Success." :-)
-                    break
                 else:
                     raise
             if not r:
@@ -411,7 +408,7 @@
                 self.handle_read_event()
             except asyncore.ExitNow:
                 raise
-            else:
+            except:
                 self.handle_error()
 
 class ManagedServerConnection(Connection):