Update to match semantics of new imaplib2
The biggest change here is that imapobj.untagged_responses is no longer a dictionary, but a list. To access it, I use the semi-private _get_untagged_response method. * offlineimap/folder/IMAP.py (IMAPFolder.quickchanged, IMAPFolder.cachemessagelist): imaplib2 now explicitly removes its EXISTS response on select(), so instead we use the return values from select() to get the number of messages. * offlineimap/imapserver.py (UsefulIMAPMixIn.select): imaplib2 now stores untagged_responses for different mailboxes, which confuses us because it seems like our mailboxes are "still" in read-only mode when we just re-opened them. Additionally, we have to return the value from imaplib2's select() so that the above thing works. * offlineimap/imapserver.py (UsefulIMAPMixIn._mesg): imaplib2 now calls _mesg with the name of a thread, so we display this information in debug output. This requires a corresponding change to imaplibutil.new_mesg. * offlineimap/imaplibutil.py: We override IMAP4_SSL.open, whose default arguments have changed, so update the default arguments. We also subclass imaplib.IMAP4 in a few different places, which now relies on having a read_fd file descriptor to poll on. Signed-off-by: Ethan Glasser-Camp <ethan@betacantrips.com> Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:

committed by
Nicolas Sebrecht

parent
f9413226b8
commit
1bf4bee5e6
@ -17,6 +17,7 @@
|
||||
|
||||
import re, socket, time, subprocess
|
||||
from offlineimap.ui import getglobalui
|
||||
import threading
|
||||
from offlineimap.imaplib2 import *
|
||||
|
||||
# Import the symbols we need that aren't exported by default
|
||||
@ -44,6 +45,8 @@ class IMAP4_Tunnel(IMAP4):
|
||||
self.process = subprocess.Popen(host, shell=True, close_fds=True,
|
||||
stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
(self.outfd, self.infd) = (self.process.stdin, self.process.stdout)
|
||||
# imaplib2 polls on this fd
|
||||
self.read_fd = self.infd.fileno()
|
||||
|
||||
def read(self, size):
|
||||
retval = ''
|
||||
@ -66,11 +69,13 @@ class IMAP4_Tunnel(IMAP4):
|
||||
self.process.wait()
|
||||
|
||||
|
||||
def new_mesg(self, s, secs=None):
|
||||
def new_mesg(self, s, tn=None, secs=None):
|
||||
if secs is None:
|
||||
secs = time.time()
|
||||
if tn is None:
|
||||
tn = threading.currentThread().getName()
|
||||
tm = time.strftime('%M:%S', time.localtime(secs))
|
||||
getglobalui().debug('imap', ' %s.%02d %s' % (tm, (secs*100)%100, s))
|
||||
getglobalui().debug('imap', ' %s.%02d %s %s' % (tm, (secs*100)%100, tn, s))
|
||||
|
||||
class WrappedIMAP4_SSL(IMAP4_SSL):
|
||||
"""Provides an improved version of the standard IMAP4_SSL
|
||||
@ -85,7 +90,7 @@ class WrappedIMAP4_SSL(IMAP4_SSL):
|
||||
del kwargs['cacertfile']
|
||||
IMAP4_SSL.__init__(self, *args, **kwargs)
|
||||
|
||||
def open(self, host = '', port = IMAP4_SSL_PORT):
|
||||
def open(self, host=None, port=None):
|
||||
"""Do whatever IMAP4_SSL would do in open, but call sslwrap
|
||||
with cert verification"""
|
||||
#IMAP4_SSL.open(self, host, port) uses the below 2 lines:
|
||||
@ -148,6 +153,9 @@ class WrappedIMAP4_SSL(IMAP4_SSL):
|
||||
if error:
|
||||
raise ssl.SSLError("SSL Certificate host name mismatch: %s" % error)
|
||||
|
||||
# imaplib2 uses this to poll()
|
||||
self.read_fd = self.sock.fileno()
|
||||
|
||||
#TODO: Done for now. We should implement a mutt-like behavior
|
||||
#that offers the users to accept a certificate (presenting a
|
||||
#fingerprint of it) (get via self.sslobj.getpeercert()), and
|
||||
@ -263,6 +271,9 @@ class WrappedIMAP4(IMAP4):
|
||||
raise socket.error(last_error)
|
||||
self.file = self.sock.makefile('rb')
|
||||
|
||||
# imaplib2 uses this to poll()
|
||||
self.read_fd = self.sock.fileno()
|
||||
|
||||
mustquote = re.compile(r"[^\w!#$%&'+,.:;<=>?^`|~-]")
|
||||
|
||||
def Internaldate2epoch(resp):
|
||||
|
Reference in New Issue
Block a user