summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/imaplib.py6
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 4 deletions
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 @@ 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 109297e..46e02fc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -293,6 +293,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.