From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 28 Sep 2008 21:00:42 +0000 (+0000)
Subject: Merged revisions 66673 via svnmerge from
X-Git-Tag: v3.0rc2~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d06e3b00e994ab0128e4f187a39c3b9eab0e30d2;p=python

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 ae889f96c6..afc8fda0b9 100644
--- 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