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

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index aaf12fef6a2488c09ed70c2571d7342818dec158..ebc88df3b5af56f56b41e178f625af035c352768 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -392,7 +392,7 @@ class FTP:
         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')

diff --git a/Misc/ACKS b/Misc/ACKS
index b4135402dfafe99936ce1458577908d4be2d7457..1897e307da9ff534312c5ccec3f50a83a01280a7 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -226,6 +226,7 @@ John Interrante
 Ben Jackson
 Paul Jackson
 David Jacobs
+Geert Jansen
 Jack Jansen
 Bill Janssen
 Drew Jenkins