From a77d7a52e88fdbb3068b99bd15eba8a0aa204529 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola' Date: Mon, 18 Mar 2013 09:59:15 +0100 Subject: [PATCH] (issue 17452 / ftplib) fix TypeError occurring in case ssl module is not installed --- Lib/ftplib.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/ftplib.py b/Lib/ftplib.py index a7f03e8cc42..c5554f8f69d 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -440,7 +440,7 @@ def retrbinary(self, cmd, callback, blocksize=8192, rest=None): break callback(data) # shutdown ssl layer - if isinstance(conn, _SSLSocket): + if _SSLSocket is not None and isinstance(conn, _SSLSocket): conn.unwrap() return self.voidresp() @@ -473,7 +473,7 @@ def retrlines(self, cmd, callback = None): line = line[:-1] callback(line) # shutdown ssl layer - if isinstance(conn, _SSLSocket): + if _SSLSocket is not None and isinstance(conn, _SSLSocket): conn.unwrap() return self.voidresp() @@ -502,7 +502,7 @@ def storbinary(self, cmd, fp, blocksize=8192, callback=None, rest=None): if callback: callback(buf) # shutdown ssl layer - if isinstance(conn, _SSLSocket): + if _SSLSocket is not None and isinstance(conn, _SSLSocket): conn.unwrap() return self.voidresp() @@ -531,7 +531,7 @@ def storlines(self, cmd, fp, callback=None): if callback: callback(buf) # shutdown ssl layer - if isinstance(conn, _SSLSocket): + if _SSLSocket is not None and isinstance(conn, _SSLSocket): conn.unwrap() return self.voidresp()