tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ssl socket wrap deprecation warning.

Browse Source
This commit is contained in:
Toke Høiland-Jørgensen 2009-08-24 20:11:22 +02:00 committed by John Goerzen
parent be086d428c
commit a781016633
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
offlineimap/imaplibutil.py
View File

@ -23,9 +23,11 @@ from imaplib import *
# Import the symbols we need that aren't exported by default # Import the symbols we need that aren't exported by default
from imaplib import IMAP4_PORT, IMAP4_SSL_PORT, InternalDate, Mon2num from imaplib import IMAP4_PORT, IMAP4_SSL_PORT, InternalDate, Mon2num
# ssl is new in python 2.6 try:
if (sys.version_info[0] == 2 and sys.version_info[1] >= 6) or sys.version_info[0] >= 3:
import ssl import ssl
ssl_wrap = ssl.wrap_socket
except ImportError:
ssl_wrap = socket.ssl
class IMAP4_Tunnel(IMAP4): class IMAP4_Tunnel(IMAP4):
"""IMAP4 client class over a tunnel """IMAP4 client class over a tunnel
@ -169,7 +171,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)
self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile) self.sslobj = ssl_wrap(self.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!#$%&'+,.:;<=>?^`|~-]")