From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Mon, 18 Mar 2013 08:59:15 +0000 (+0100)
Subject: (issue 17452 / ftplib) fix TypeError occurring in case ssl module is not installed
X-Git-Tag: v3.4.0a1~1182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a77d7a52e88fdbb3068b99bd15eba8a0aa204529;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index a7f03e8cc426..c5554f8f69d0 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -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()