diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py index a60242b..c4d577d 100644 --- a/offlineimap/imaplibutil.py +++ b/offlineimap/imaplibutil.py @@ -108,14 +108,6 @@ def new_mesg(self, s, secs=None): tm = time.strftime('%M:%S', time.localtime(secs)) UIBase.getglobalui().debug('imap', ' %s.%02d %s' % (tm, (secs*100)%100, s)) -class WrappedIMAP4_SSL(IMAP4_SSL): - def open(self, host = '', port = IMAP4_SSL_PORT): - IMAP4_SSL.open(self, host, port) - self.sslobj = sslwrapper(self.sslobj) - - def readline(self): - return self.sslobj.readline() - def new_open(self, host = '', port = IMAP4_PORT): """Setup connection to remote server on "host:port" (default: localhost:standard IMAP4 port). diff --git a/offlineimap/imapserver.py b/offlineimap/imapserver.py index 74f1a27..cea944f 100644 --- a/offlineimap/imapserver.py +++ b/offlineimap/imapserver.py @@ -80,9 +80,7 @@ class UsefulIMAP4(UsefulIMAPMixIn, imaplib.IMAP4): else: return imaplib.IMAP4.read (self, size) -class UsefulIMAP4_SSL(UsefulIMAPMixIn, imaplibutil.WrappedIMAP4_SSL): - def open(self, host = '', port = imaplib.IMAP4_SSL_PORT): - imaplibutil.new_open_ssl(self, host, port) +class UsefulIMAP4_SSL(UsefulIMAPMixIn, imaplib.IMAP4_SSL): # This is the same hack as above, to be used in the case of an SSL # connexion. @@ -97,7 +95,7 @@ class UsefulIMAP4_SSL(UsefulIMAPMixIn, imaplibutil.WrappedIMAP4_SSL): io.write(data) return io.getvalue() else: - return imaplibutil.WrappedIMAP4_SSL.read (self,size) + return imaplib.IMAP4_SSL.read(self,size) class UsefulIMAP4_Tunnel(UsefulIMAPMixIn, imaplibutil.IMAP4_Tunnel): pass