[Python-checkins] cpython: (issue 17452 / ftplib) fix TypeError occurring in case ssl module is not

Mon Mar 18 09:59:28 CET 2013

http://hg.python.org/cpython/rev/0842c5411ed6
changeset: 82729:0842c5411ed6
parent: 82727:59621d4f1171
user: Giampaolo Rodola' <g.rodola at gmail.com>
date: Mon Mar 18 09:59:15 2013 +0100
summary:
 (issue 17452 / ftplib) fix TypeError occurring in case ssl module is not installed
files:
 Lib/ftplib.py | 8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
--- 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()
 
-- 
Repository URL: http://hg.python.org/cpython
