From a8dd0941b8becfb48788b333ba2329953a5d90d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 8 May 2002 08:56:33 +0000 Subject: Patch #553277: Accept callbacks that are callable, not callbacks that are true. --- Lib/ftplib.py | 2 +- Misc/ACKS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 @@ 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 b413540..1897e30 100644 --- 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 -- cgit v0.12