mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-30 13:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Giampaolo Rodola' 2013-03-18 09:59:15 +01:00
parent 0351928359
commit a77d7a52e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/ftplib.py
View File

@ -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:
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:
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:
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()