From fe8fb46ad349b1df7b7a3e8dff60eade9e3b266b Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 15 May 2009 12:03:56 +0000 Subject: [PATCH] Merged revisions 72662 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72662 | antoine.pitrou | 2009-05-15 13:50:29 +0200 (ven., 15 mai 2009) | 3 lines Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. ........ --- Lib/imaplib.py | 6 ++---- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 7807e8f3b8d..f13350e3223 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -226,8 +226,7 @@ class IMAP4: """ self.host = host self.port = port - self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.sock.connect((host, port)) + self.sock = socket.create_connection((host, port)) self.file = self.sock.makefile('rb') @@ -1145,8 +1144,7 @@ else: """ self.host = host self.port = port - self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.sock.connect((host, port)) + self.sock = socket.create_connection((host, port)) self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile) diff --git a/Misc/NEWS b/Misc/NEWS index 93b4aacfadf..23690c271be 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -47,6 +47,8 @@ Core and Builtins Library ------- +- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. + - Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. - Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when