(issue 17452 / ftplib) fix TypeError occurring in case ssl module is not installed

giampaolo · giampaolo · commit a77d7a52e88f · 2013-03-18T09:59:15.000+01:00
diff --git 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()
 
