[Python-checkins] CVS: python/dist/src/Lib asyncore.py,1.14,1.15

2001年8月10日 07:30:38 -0700

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv1075
Modified Files:
	asyncore.py 
Log Message:
Remove hard-coded NT constants that are already defined in errno on NT.
Wrap some long lines.
Remove unnecessary tuple unpack.
Index: asyncore.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** asyncore.py	2001年05月11日 18:28:54	1.14
--- asyncore.py	2001年08月10日 14:30:35	1.15
***************
*** 54,66 ****

 import os
! if os.name == 'nt':
! EWOULDBLOCK = 10035
! EINPROGRESS = 10036
! EALREADY = 10037
! ECONNRESET = 10054
! ENOTCONN = 10057
! ESHUTDOWN = 10058
! else:
! from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, ENOTCONN, ESHUTDOWN

 try:
--- 54,59 ----

 import os
! from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
! ENOTCONN, ESHUTDOWN 

 try:
***************
*** 265,269 ****
 self.socket.setsockopt (
 socket.SOL_SOCKET, socket.SO_REUSEADDR,
! self.socket.getsockopt (socket.SOL_SOCKET, socket.SO_REUSEADDR) | 1
 )
 except socket.error:
--- 258,263 ----
 self.socket.setsockopt (
 socket.SOL_SOCKET, socket.SO_REUSEADDR,
! self.socket.getsockopt (socket.SOL_SOCKET,
! socket.SO_REUSEADDR) | 1
 )
 except socket.error:
***************
*** 399,403 ****

 def handle_error (self):
! (file,fun,line), t, v, tbinfo = compact_traceback()

 # sometimes a user repr method will crash.
--- 393,397 ----

 def handle_error (self):
! nil, t, v, tbinfo = compact_traceback()

 # sometimes a user repr method will crash.