[Python-checkins] python/dist/src/Lib asyncore.py,1.28.4.2,1.28.4.3

theller@users.sourceforge.net theller@users.sourceforge.net
Tue, 24 Sep 2002 10:44:42 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv13412

Modified Files:
      Tag: release22-maint
	asyncore.py 
Log Message:
backport of the checkin of revision 1.36 of asyncore.py

On Windows, select() does not accept empty lists.
Patch suggested by Guido, fixes SF item 611464.

Bugfix candidate, will backport to release22-maint myself.


Index: asyncore.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.28.4.2
retrieving revision 1.28.4.3
diff -C2 -d -r1.28.4.2 -r1.28.4.3
*** asyncore.py	15 Mar 2002 10:32:07 -0000	1.28.4.2
--- asyncore.py	24 Sep 2002 17:44:40 -0000	1.28.4.3
***************
*** 51,54 ****
--- 51,55 ----
  import socket
  import sys
+ import time
  
  import os
***************
*** 76,85 ****
              if obj.writable():
                  w.append (fd)
!         try:
!             r,w,e = select.select (r,w,e, timeout)
!         except select.error, err:
!             if err[0] != EINTR:
!                 raise
!             r = []; w = []; e = []
  
          if DEBUG:
--- 77,89 ----
              if obj.writable():
                  w.append (fd)
!         if [] == r == w == e:
!             time.sleep(timeout)
!         else:
!             try:
!                 r,w,e = select.select (r,w,e, timeout)
!             except select.error, err:
!                 if err[0] != EINTR:
!                     raise
!                 r = []; w = []; e = []
  
          if DEBUG: