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

[Guido van Rossum]

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

Modified Files:
      Tag: r22rc1-branch
	asyncore.py 
Log Message:
Merge two of Jeremy's last-minute changes on the trunk into the release branch.

Index: asyncore.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.27
retrieving revision 1.27.4.1
diff -C2 -d -r1.27 -r1.27.4.1
*** asyncore.py	2001/10/30 14:16:17	1.27
--- asyncore.py	2001/12/14 16:25:53	1.27.4.1
***************
*** 213,217 ****
              self.socket.setblocking (0)
              self.connected = 1
!             self.addr = sock.getpeername()
          else:
              self.socket = None
--- 213,223 ----
              self.socket.setblocking (0)
              self.connected = 1
!             # XXX Does the constructor require that the socket passed
!             # be connected?
!             try:
!                 self.addr = sock.getpeername()
!             except socket.error:
!                 # The addr isn't crucial
!                 pass
          else:
              self.socket = None