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

imaplib2: bump upstream version 2.29 --> 2.33

Browse Source 
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2012-04-19 13:18:44 +02:00
parent 679c491c56
commit 8fe8bbe366
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Changelog.rst
View File

@ -8,14 +8,7 @@ ChangeLog
WIP (add new stuff for the next release) WIP (add new stuff for the next release)
======================================== ========================================
New Features * bump bundled imaplib2 library 2.29 --> 2.33
------------
Changes
-------
Bug Fixes
---------
OfflineIMAP v6.5.3.1 (2012-04-03) OfflineIMAP v6.5.3.1 (2012-04-03)
================================= =================================

39
offlineimap/imaplib2.py
View File

@ -17,9 +17,9 @@ Public functions: Internaldate2Time
__all__ = ("IMAP4", "IMAP4_SSL", "IMAP4_stream", __all__ = ("IMAP4", "IMAP4_SSL", "IMAP4_stream",
"Internaldate2Time", "ParseFlags", "Time2Internaldate") "Internaldate2Time", "ParseFlags", "Time2Internaldate")
__version__ = "2.29" __version__ = "2.33"
__release__ = "2" __release__ = "2"
__revision__ = "29" __revision__ = "33"
__credits__ = """ __credits__ = """
Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998. Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
String method conversion by ESR, February 2001. String method conversion by ESR, February 2001.
@ -462,19 +462,16 @@ class IMAP4(object):
cert_reqs = ssl.CERT_NONE cert_reqs = ssl.CERT_NONE
self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile, ca_certs=self.ca_certs, cert_reqs=cert_reqs) self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile, ca_certs=self.ca_certs, cert_reqs=cert_reqs)
ssl_exc = ssl.SSLError ssl_exc = ssl.SSLError
self.read_fd = self.sock.fileno()
except ImportError: except ImportError:
# No ssl module, and socket.ssl does not allow certificate verification # No ssl module, and socket.ssl has no fileno(), and does not allow certificate verification
if self.ca_certs is not None: raise socket.sslerror("imaplib2 SSL mode does not work without ssl module")
raise socket.sslerror("SSL CA certificates cannot be checked without ssl module")
self.sock = socket.ssl(self.sock, self.keyfile, self.certfile)
ssl_exc = socket.sslerror
if self.cert_verify_cb is not None: if self.cert_verify_cb is not None:
cert_err = self.cert_verify_cb(self.sock.getpeercert(), self.host) cert_err = self.cert_verify_cb(self.sock.getpeercert(), self.host)
if cert_err: if cert_err:
raise ssl_exc(cert_err) raise ssl_exc(cert_err)
self.read_fd = self.sock.fileno()
def start_compressing(self): def start_compressing(self):
@ -496,7 +493,7 @@ class IMAP4(object):
if self.decompressor.unconsumed_tail: if self.decompressor.unconsumed_tail:
data = self.decompressor.unconsumed_tail data = self.decompressor.unconsumed_tail
else: else:
data = self.sock.recv(8192) data = self.sock.recv(READ_SIZE)
return self.decompressor.decompress(data, size) return self.decompressor.decompress(data, size)
@ -1233,9 +1230,10 @@ class IMAP4(object):
def _choose_nonull_or_dflt(self, dflt, *args): def _choose_nonull_or_dflt(self, dflt, *args):
dflttyp = type(dflt) if isinstance(dflt, basestring):
if isinstance(dflttyp, basestring):
dflttyp = basestring # Allow any string type dflttyp = basestring # Allow any string type
else:
dflttyp = type(dflt)
for arg in args: for arg in args:
if arg is not None: if arg is not None:
if isinstance(arg, dflttyp): if isinstance(arg, dflttyp):
@ -1591,7 +1589,8 @@ class IMAP4(object):
def _simple_command(self, name, *args, **kw): def _simple_command(self, name, *args, **kw):
if 'callback' in kw: if 'callback' in kw:
self._command(name, *args, callback=self._command_completer, cb_arg=kw, cb_self=True) # Note: old calling sequence for back-compat with python <2.6
self._command(name, callback=self._command_completer, cb_arg=kw, cb_self=True, *args)
return (None, None) return (None, None)
return self._command_complete(self._command(name, *args), kw) return self._command_complete(self._command(name, *args), kw)
@ -1752,8 +1751,9 @@ class IMAP4(object):
if rxzero > 5: if rxzero > 5:
raise IOError("Too many read 0") raise IOError("Too many read 0")
time.sleep(0.1) time.sleep(0.1)
else: continue # Try again
rxzero = 0 rxzero = 0
while True: while True:
stop = data.find('\n', start) stop = data.find('\n', start)
if stop < 0: if stop < 0:
@ -1818,8 +1818,9 @@ class IMAP4(object):
if rxzero > 5: if rxzero > 5:
raise IOError("Too many read 0") raise IOError("Too many read 0")
time.sleep(0.1) time.sleep(0.1)
else: continue # Try again
rxzero = 0 rxzero = 0
while True: while True:
stop = data.find('\n', start) stop = data.find('\n', start)
if stop < 0: if stop < 0:
@ -2020,7 +2021,7 @@ class IMAP4_SSL(IMAP4):
if self.decompressor.unconsumed_tail: if self.decompressor.unconsumed_tail:
data = self.decompressor.unconsumed_tail data = self.decompressor.unconsumed_tail
else: else:
data = self.sock.read(8192) data = self.sock.read(READ_SIZE)
return self.decompressor.decompress(data, size) return self.decompressor.decompress(data, size)
@ -2047,7 +2048,7 @@ class IMAP4_SSL(IMAP4):
def ssl(self): def ssl(self):
"""ssl = ssl() """ssl = ssl()
Return socket.ssl instance used to communicate with the IMAP4 server.""" Return ssl instance used to communicate with the IMAP4 server."""
return self.sock return self.sock
@ -2103,7 +2104,7 @@ class IMAP4_stream(IMAP4):
if self.decompressor.unconsumed_tail: if self.decompressor.unconsumed_tail:
data = self.decompressor.unconsumed_tail data = self.decompressor.unconsumed_tail
else: else:
data = os.read(self.read_fd, 8192) data = os.read(self.read_fd, READ_SIZE)
return self.decompressor.decompress(data, size) return self.decompressor.decompress(data, size)