[Python-checkins] python/dist/src/Lib asyncore.py,1.48,1.49

Sun Mar 21 14:58:46 EST 2004

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10878
Modified Files:
	asyncore.py 
Log Message:
[Part of patch #909005] Repeating exception changed from 'raise socket.error, why' to just raise. Make use of connect_ex() raise socket.error with 2-tuple instead of just error code
Index: asyncore.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** asyncore.py	21 Mar 2004 19:52:01 -0000	1.48
--- asyncore.py	21 Mar 2004 19:58:28 -0000	1.49
***************
*** 55,59 ****
 import os
 from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
! ENOTCONN, ESHUTDOWN, EINTR, EISCONN
 
 try:
--- 55,59 ----
 import os
 from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
! ENOTCONN, ESHUTDOWN, EINTR, EISCONN, errorcode
 
 try:
***************
*** 288,292 ****
 self.handle_connect()
 else:
! raise socket.error, err
 
 def accept(self):
--- 288,292 ----
 self.handle_connect()
 else:
! raise socket.error, (err, errorcode[err])
 
 def accept(self):
***************
*** 299,303 ****
 pass
 else:
! raise socket.error, why
 
 def send(self, data):
--- 299,303 ----
 pass
 else:
! raise 
 
 def send(self, data):
***************
*** 309,313 ****
 return 0
 else:
! raise socket.error, why
 return 0
 
--- 309,313 ----
 return 0
 else:
! raise 
 return 0
 
***************
*** 328,332 ****
 return ''
 else:
! raise socket.error, why
 
 def close(self):
--- 328,332 ----
 return ''
 else:
! raise 
 
 def close(self):