commit a77d7a52e88fdbb3068b99bd15eba8a0aa204529
author Giampaolo Rodola' <g.rodola@gmail.com> Mon Mar 18 09:59:15 2013 +0100
committer Giampaolo Rodola' <g.rodola@gmail.com> Mon Mar 18 09:59:15 2013 +0100
tree a45eb9bfdae727d3760786a051cf89c163c92c1e
parent 0351928359b372a37838980190beecebf5f5c3c7

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

Lib/ftplib.py

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index a7f03e8..c5554f8 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -440,7 +440,7 @@
                     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 @@
                     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 @@
                 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 @@
                 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()