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 ae889f96c6f12af9485567218d01f7cf6c1386be..afc8fda0b91dc9e6b1bbf5a5b06078b682a360c4 100644 (file)
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -214,6 +214,11 @@ class DummyFTPServer(asyncore.dispatcher, threading.Thread):
     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