Don't set passiveserver to 0 in connect(). See SF bug #495693.

This should definitely be backported to 2.2.1.  I'll leave it to Jack
to decide whether he wants to fix this in MacPython 2.2.

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 592f5d29d2caa6be47b70248f7b16f9d74d69e02..a176a8737036b6278b59ecfbb3b5d082151080a2 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -114,7 +114,6 @@ class FTP:
         - port: port to connect to (integer, default previous port)'''
         if host: self.host = host
         if port: self.port = port
-        self.passiveserver = 0
         msg = "getaddrinfo returns an empty list"
         for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
             af, socktype, proto, canonname, sa = res