diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-28 21:00:42 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-28 21:00:42 (GMT) |
| commit | d06e3b00e994ab0128e4f187a39c3b9eab0e30d2 (patch) | |
| tree | 748aa55087132b859c3e77374bb7f86ca1ae9109 | |
| parent | 89f09a687e355e9acb0ec5b540b31b450b05d2f5 (diff) | |
| download | cpython-d06e3b00e994ab0128e4f187a39c3b9eab0e30d2.zip cpython-d06e3b00e994ab0128e4f187a39c3b9eab0e30d2.tar.gz cpython-d06e3b00e994ab0128e4f187a39c3b9eab0e30d2.tar.bz2 | |
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]
........
| -rw-r--r-- | Lib/test/test_ftplib.py | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ 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 |