diff -r 59621d4f1171 Lib/ftplib.py --- a/Lib/ftplib.py Mon Mar 18 00:21:43 2013 -0400 +++ b/Lib/ftplib.py Sun Mar 17 20:06:48 2013 -1000 @@ -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()