Kaydet (Commit) a77d7a52 authored tarafından Giampaolo Rodola''s avatar Giampaolo Rodola'

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

üst 03519283
...@@ -440,7 +440,7 @@ class FTP: ...@@ -440,7 +440,7 @@ class FTP:
break break
callback(data) callback(data)
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, _SSLSocket): if _SSLSocket is not None and isinstance(conn, _SSLSocket):
conn.unwrap() conn.unwrap()
return self.voidresp() return self.voidresp()
...@@ -473,7 +473,7 @@ class FTP: ...@@ -473,7 +473,7 @@ class FTP:
line = line[:-1] line = line[:-1]
callback(line) callback(line)
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, _SSLSocket): if _SSLSocket is not None and isinstance(conn, _SSLSocket):
conn.unwrap() conn.unwrap()
return self.voidresp() return self.voidresp()
...@@ -502,7 +502,7 @@ class FTP: ...@@ -502,7 +502,7 @@ class FTP:
if callback: if callback:
callback(buf) callback(buf)
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, _SSLSocket): if _SSLSocket is not None and isinstance(conn, _SSLSocket):
conn.unwrap() conn.unwrap()
return self.voidresp() return self.voidresp()
...@@ -531,7 +531,7 @@ class FTP: ...@@ -531,7 +531,7 @@ class FTP:
if callback: if callback:
callback(buf) callback(buf)
# shutdown ssl layer # shutdown ssl layer
if isinstance(conn, _SSLSocket): if _SSLSocket is not None and isinstance(conn, _SSLSocket):
conn.unwrap() conn.unwrap()
return self.voidresp() return self.voidresp()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment