1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug 1482: IMAP4 SSL isn't working

Browse Source
This commit is contained in:
Bill Janssen 2008-02-01 02:16:46 +00:00
parent db0a9b37b6
commit a7712090f7
1 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Lib/imaplib.py
View File

@ -1145,55 +1145,10 @@ else:
""" """
self.host = host self.host = host
self.port = port self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect((host, port)) sock.connect((host, port))
self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile) self.sock = ssl.wrap_socket(sock, self.keyfile, self.certfile)
self.file = self.sock.makefile('rb')
def read(self, size):
"""Read 'size' bytes from remote."""
# sslobj.read() sometimes returns < size bytes
chunks = []
read = 0
while read < size:
data = self.sslobj.read(size-read)
read += len(data)
chunks.append(data)
return ''.join(chunks)
def readline(self):
"""Read line from remote."""
line = []
while 1:
char = self.sslobj.read(1)
line.append(char)
if char == "\n": return ''.join(line)
def send(self, data):
"""Send data to remote."""
bytes = len(data)
while bytes > 0:
sent = self.sslobj.write(data)
if sent == bytes:
break # avoid copy
data = data[sent:]
bytes = bytes - sent
def shutdown(self):
"""Close I/O established in "open"."""
self.sock.close()
def socket(self):
"""Return socket instance used to connect to IMAP4 server.
socket = <instance>.socket()
"""
return self.sock
def ssl(self): def ssl(self):
@ -1201,7 +1156,7 @@ else:
ssl = ssl.wrap_socket(<instance>.socket) ssl = ssl.wrap_socket(<instance>.socket)
""" """
return self.sslobj return self.sock
__all__.append("IMAP4_SSL") __all__.append("IMAP4_SSL")