Merged revisions 66673 via svnmerge from
svn+ssh://pythondev@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]
........
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index ae889f9..afc8fda 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -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