[Python-checkins] r72643 - in python/branches/py3k: Lib/nntplib.py Misc/ACKS Misc/NEWS

Thu May 14 23:30:46 CEST 2009

Author: antoine.pitrou
Date: Thu May 14 23:30:46 2009
New Revision: 72643
Log:
Merged revisions 72640 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r72640 | antoine.pitrou | 2009年05月14日 23:22:08 +0200 (jeu., 14 mai 2009) | 5 lines
 
 Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr.
 
 (Unfortunately, nntplib doesn't have a test suite)
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/nntplib.py
 python/branches/py3k/Misc/ACKS
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/nntplib.py
==============================================================================

--- python/branches/py3k/Lib/nntplib.py	(original)
+++ python/branches/py3k/Lib/nntplib.py	Thu May 14 23:30:46 2009
@@ -109,8 +109,7 @@
 """
 self.host = host
 self.port = port
- self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- self.sock.connect((self.host, self.port))
+ self.sock = socket.create_connection((host, port))
 self.file = self.sock.makefile('rb')
 self.debugging = 0
 self.welcome = self.getresp()
Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Thu May 14 23:30:46 2009
@@ -496,6 +496,7 @@
 The Dragon De Monsyne
 Skip Montanaro
 Paul Moore
+Derek Morr
 James A Morrison
 Sjoerd Mullender
 Sape Mullender
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu May 14 23:30:46 2009
@@ -23,6 +23,8 @@
 Library
 -------
 
+- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr.
+
 - Issue #5006: Better handling of unicode byte-order marks (BOM) in the io
 library. This means, for example, that opening an UTF-16 text file in
 append mode doesn't add a BOM at the end of the file if the file isn't
