[Checkins] SVN: zc.ngi/trunk/src/zc/ngi/async.py Make the expected output a bit less specific since we get slightly

[Jim Fulton]

Log message for revision 70469:
  Make the expected output a bit less specific since we get slightly
  different connection-failure modes between Python 2.3 and later versions.
  

Changed:
  U   zc.ngi/trunk/src/zc/ngi/async.py

-=-
Modified: zc.ngi/trunk/src/zc/ngi/async.py
===================================================================
--- zc.ngi/trunk/src/zc/ngi/async.py	2006-10-02 11:10:39 UTC (rev 70468)
+++ zc.ngi/trunk/src/zc/ngi/async.py	2006-10-02 11:10:41 UTC (rev 70469)
@@ -453,11 +453,19 @@
     timeout = 30.0
     map = _map
     connectors = _connectors
-    if hasattr(select, 'poll'):
-        poll_fun = asyncore.poll3
-    else:
-        poll_fun = asyncore.poll
 
+# There seem to be some issues with poll.  
+##     if (hasattr(select, 'poll') and
+##         (sys.version_info[:2] > (2, 3)) # There seem to be poll issues in 2.3
+##         ):
+##         poll_fun = asyncore.poll3
+##     else:
+##         poll_fun = asyncore.poll
+
+
+    # At least for now, stick with tried and true select
+    poll_fun = asyncore.poll
+
     logger = logging.getLogger('zc.ngi.async.loop')
 
     while map: