/offlineimap/head: changeset 477

Fixed SSL for Python2.3.
This commit is contained in:
jgoerzen 2003-05-28 04:01:27 +01:00
parent ce125cc366
commit d52c007857
3 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
offlineimap (3.99.18) unstable; urgency=low
* Made a fix for Python2.3 compatibility.
-- John Goerzen <jgoerzen@complete.org> Tue, 27 May 2003 16:58:54 -0500
offlineimap (3.99.17) unstable; urgency=low offlineimap (3.99.17) unstable; urgency=low
* Fixed two potential obscure race conditions in folder/Maildir.py. * Fixed two potential obscure race conditions in folder/Maildir.py.

View File

@ -130,8 +130,9 @@ class IMAPFolder(BaseFolder):
ui.debug('imap', 'savemessage_addheader: insertionpoint = %d' % insertionpoint) ui.debug('imap', 'savemessage_addheader: insertionpoint = %d' % insertionpoint)
leader = content[0:insertionpoint] leader = content[0:insertionpoint]
ui.debug('imap', 'savemessage_addheader: leader = %s' % repr(leader)) ui.debug('imap', 'savemessage_addheader: leader = %s' % repr(leader))
if insertionpoint == 0: if insertionpoint == 0 or insertionpoint == -1:
newline = '' newline = ''
insertionpoint = 0
else: else:
newline = "\r\n" newline = "\r\n"
newline += "%s: %s" % (headername, headervalue) newline += "%s: %s" % (headername, headervalue)

View File

@ -1129,7 +1129,7 @@ class IMAP4_SSL(IMAP4):
self.port = port self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect((host, port)) self.sock.connect((host, port))
self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile) self.sslobj = socket.ssl(self.sock._sock, self.keyfile, self.certfile)
self.sslobj = sslwrapper(self.sslobj) self.sslobj = sslwrapper(self.sslobj)