From: Raymond Hettinger <python@rcn.com>
Date: Sun, 12 May 2002 05:53:51 +0000 (+0000)
Subject: Closes SF patch 553277.  Per GvR, reverting to original patch -- the way to
X-Git-Tag: v2.3c1~5690
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e874fc304e0ea29fc9608023b3f153b566e0acef;p=python

Closes SF patch 553277.  Per GvR, reverting to original patch -- the way to
test if 'callable' has not been supplied is to test for None instead of
False.  The previous correction to 'if callable()' was wrong because an unusable
callback would be ignored rather than raising an exception.
---

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index ebc88df3b5..2ccfbcbffc 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 callable(callback): callback = print_line
+        if callback is None: callback = print_line
         resp = self.sendcmd('TYPE A')
         conn = self.transfercmd(cmd)
         fp = conn.makefile('rb')