Changed by: jack.diederich
Changed at: Fri 06 Nov 2009 21:15:00
Branch: branches/release31-maint
Revision: 76136
Changed files:

• branches/release31-maint/
• branches/release31-maint/Lib/test/test_telnetlib.py
• branches/release31-maint/Misc/ACKS

Merged revisions 74638,76133 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74638 | jack.diederich | 2009-09-03 16:37:58 -0400 (Thu, 03 Sep 2009) | 4 lines
  
  - apply issue 6582 to test all the write methods of telnetlib
  - add patch author to ACKS
  - possibly fix test timeouts on non-linux platforms
........
  r76133 | jack.diederich | 2009-11-06 12:20:42 -0500 (Fri, 06 Nov 2009) | 3 lines
  
  - issue #6748 intermittent test failures from sockets
  - telnetlib tests now use mock sockets for most tests
........