[Python-checkins] r72663 - in python/branches/release26-maint: Lib/imaplib.py Misc/NEWS

Fri May 15 14:03:59 CEST 2009

Author: antoine.pitrou
Date: Fri May 15 14:03:56 2009
New Revision: 72663
Log:
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.
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/imaplib.py
 python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/imaplib.py
==============================================================================

--- python/branches/release26-maint/Lib/imaplib.py	(original)
+++ python/branches/release26-maint/Lib/imaplib.py	Fri May 15 14:03:56 2009
@@ -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)
 
 
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri May 15 14:03:56 2009
@@ -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
