[Python-3000-checkins] r66675 - in python/branches/py3k: Lib/test/test_ftplib.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Sep 28 23:00:42 2008
New Revision: 66675

Log:
Merged revisions 66673 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk

........
r66673 | benjamin.peterson | 2008-09-28 15:57:21 -0500 (Sun, 28 Sep 2008) | 1 line

merge in the fix for test_ftplib on some bots [reviewed by Georg]
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/test_ftplib.py

Modified: python/branches/py3k/Lib/test/test_ftplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ftplib.py (original)
+++ python/branches/py3k/Lib/test/test_ftplib.py Sun Sep 28 23:00:42 2008
@@ -214,6 +214,11 @@
def handle_accept(self):
conn, addr = self.accept()
self.handler = self.handler(conn)
+ self.close()
+
+ def handle_connect(self):
+ self.close()
+ handle_read = handle_connect

def writable(self):
return 0