[Python-checkins] CVS: python/dist/src/Lib ftplib.py,1.60,1.60.10.1

[Michael Hudson]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv18702

Modified Files:
      Tag: release22-maint
	ftplib.py 
Log Message:
Backport Guido's checkin of version 1.61:

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.



Index: ftplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.60
retrieving revision 1.60.10.1
diff -C2 -d -r1.60 -r1.60.10.1
*** ftplib.py	2001/10/17 17:21:47	1.60
--- ftplib.py	2001/12/28 10:11:32	1.60.10.1
***************
*** 115,119 ****
          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):
--- 115,118 ----