summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2002-05-12 05:53:51 (GMT)
committerRaymond Hettinger <python@rcn.com>2002-05-12 05:53:51 (GMT)
commite874fc304e0ea29fc9608023b3f153b566e0acef (patch)
treee76db95537adb58d71c43daa97d5caefcba467a4
parent94153096f5bb3dd19989d83ffbc38f140828ae3a (diff)
downloadcpython-e874fc304e0ea29fc9608023b3f153b566e0acef.zip
cpython-e874fc304e0ea29fc9608023b3f153b566e0acef.tar.gz
cpython-e874fc304e0ea29fc9608023b3f153b566e0acef.tar.bz2
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.
-rw-r--r--Lib/ftplib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index ebc88df..2ccfbcb 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')