]> granicus.if.org Git - python/commitdiff
(issue 17452 / ftplib) fix TypeError occurring in case ssl module is not installed
authorGiampaolo Rodola' <g.rodola@gmail.com>
Mon, 18 Mar 2013 08:59:15 +0000 (09:59 +0100)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Mon, 18 Mar 2013 08:59:15 +0000 (09:59 +0100)
Lib/ftplib.py

index a7f03e8cc4262aacb92e811cf00a86e60577e503..c5554f8f69d0de4d2975675210da8afec463d690 100644 (file)
@@ -440,7 +440,7 @@ class FTP:
                     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 @@ class FTP:
                     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 @@ class FTP:
                 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 @@ class FTP:
                 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()