commit a8dd0941b8becfb48788b333ba2329953a5d90d7
author Martin v. Löwis <martin@v.loewis.de> Wed May 08 08:56:33 2002 +0000
committer Martin v. Löwis <martin@v.loewis.de> Wed May 08 08:56:33 2002 +0000
tree 527b8c0b76b3935d08db5855f8c1445f9f5ef99f
parent 09bdf72be30aefd71b515ccced5fe7cd6cec154d

Patch #553277: Accept callbacks that are callable, not callbacks that are true.

Lib/ftplib.py

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index aaf12fe..ebc88df 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -392,7 +392,7 @@
         The callback function (2nd argument) is called for each line,
         with trailing CRLF stripped.  This creates a new port for you.
         print_line() is the default callback.'''
-        if not callback: callback = print_line
+        if not callable(callback): callback = print_line
         resp = self.sendcmd('TYPE A')
         conn = self.transfercmd(cmd)
         fp = conn.makefile('rb')

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index b413540..1897e30 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -226,6 +226,7 @@
 Ben Jackson
 Paul Jackson
 David Jacobs
+Geert Jansen
 Jack Jansen
 Bill Janssen
 Drew Jenkins