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 7807e8f..f13350e 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -226,8 +226,7 @@
"""
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 @@
"""
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 93b4aac..23690c2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,6 +47,8 @@
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