From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 15 May 2009 12:15:51 +0000 (+0000)
Subject: Merged revisions 72662 via svnmerge from
X-Git-Tag: v3.1rc1~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1d0936d5b96da4bd2e127d235bf65a4f81609bf;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 6469df2dcf04..df35cb14b02a 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 9173a72e0d5c..d3f4177c6564 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.