From c1d0936d5b96da4bd2e127d235bf65a4f81609bf Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 15 May 2009 12:15:51 +0000 Subject: 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 | 4 +--- Misc/NEWS | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 6469df2..df35cb1 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -222,9 +222,7 @@ class IMAP4: def _create_socket(self): - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sock.connect((self.host, self.port)) - return sock + return socket.create_connection((self.host, self.port)) def open(self, host = '', port = IMAP4_PORT): """Setup connection to remote server on "host:port" diff --git a/Misc/NEWS b/Misc/NEWS index 9173a72..d3f4177 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -23,6 +23,8 @@ Core and Builtins Library ------- +- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr. + - Issue #5918: Fix a crash in the parser module. - Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. -- cgit v0.12