[Python-checkins] r72664 - in python/branches/py3k: Lib/imaplib.py Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri May 15 14:15:51 2009
New Revision: 72664

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/py3k/   (props changed)
   python/branches/py3k/Lib/imaplib.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/imaplib.py
==============================================================================
--- python/branches/py3k/Lib/imaplib.py	(original)
+++ python/branches/py3k/Lib/imaplib.py	Fri May 15 14:15:51 2009
@@ -222,9 +222,7 @@
 
 
     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"

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri May 15 14:15:51 2009
@@ -23,6 +23,8 @@
 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.