imaplibutil: Remove flagrantly bad use of private attribute
Frankly, the original code doesn't even make much sense, and moreover it's not forward compatible with python 2.6, and furthermore: DeprecationWarning: socket.ssl() is deprecated. So, this commit is just a temporary fix. Signed-off-by: Michael Witten <mfwitten@mit.edu>
This commit is contained in:
parent
d097da005e
commit
5fe379f66d
@ -166,10 +166,7 @@ def new_open_ssl(self, host = '', port = IMAP4_SSL_PORT):
|
|||||||
if last_error != 0:
|
if last_error != 0:
|
||||||
# FIXME
|
# FIXME
|
||||||
raise socket.error(last_error)
|
raise socket.error(last_error)
|
||||||
if sys.version_info[0] <= 2 and sys.version_info[1] <= 2:
|
|
||||||
self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
|
self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
|
||||||
else:
|
|
||||||
self.sslobj = socket.ssl(self.sock._sock, self.keyfile, self.certfile)
|
|
||||||
self.sslobj = sslwrapper(self.sslobj)
|
self.sslobj = sslwrapper(self.sslobj)
|
||||||
|
|
||||||
mustquote = re.compile(r"[^\w!#$%&'+,.:;<=>?^`|~-]")
|
mustquote = re.compile(r"[^\w!#$%&'+,.:;<=>?^`|~-]")
|
||||||
|
Loading…
Reference in New Issue
Block a user