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 7e8dce638b114ede8766f6ca248fedf84bf45df1..c48497de343b31ebfbd18a561b13c24d54d887b4 100644 (file)
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -212,6 +212,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