Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Antoine Pitrou 2009-05-15 12:03:56 +00:00
parent 250bf34b85
commit fe8fb46ad3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/imaplib.py
View File

@ -226,8 +226,7 @@ class IMAP4:
""" """
self.host = host self.host = host
self.port = port self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.create_connection((host, port))
self.sock.connect((host, port))
self.file = self.sock.makefile('rb') self.file = self.sock.makefile('rb')
@ -1145,8 +1144,7 @@ else:
""" """
self.host = host self.host = host
self.port = port self.port = port
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.sock = socket.create_connection((host, port))
self.sock.connect((host, port))
self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile) self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)

2
Misc/NEWS
View File

@ -47,6 +47,8 @@ Core and Builtins
Library Library
------- -------
- Issue #1655: Make imaplib IPv6-capable. Patch by Derek Morr.
- Issue #1664: Make nntplib 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 - Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when