[Python-checkins] r72641 - in python/branches/release26-maint: Lib/nntplib.py Misc/ACKS Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu May 14 23:27:08 2009
New Revision: 72641

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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/nntplib.py
   python/branches/release26-maint/Misc/ACKS
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/nntplib.py
==============================================================================
--- python/branches/release26-maint/Lib/nntplib.py	(original)
+++ python/branches/release26-maint/Lib/nntplib.py	Thu May 14 23:27:08 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/release26-maint/Misc/ACKS
==============================================================================
--- python/branches/release26-maint/Misc/ACKS	(original)
+++ python/branches/release26-maint/Misc/ACKS	Thu May 14 23:27:08 2009
@@ -476,6 +476,7 @@
 The Dragon De Monsyne
 Skip Montanaro
 Paul Moore
+Derek Morr
 James A Morrison
 Sjoerd Mullender
 Sape Mullender

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Thu May 14 23:27:08 2009
@@ -194,6 +194,8 @@
 Library
 -------
 
+- Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr.
+
 - Issue #6022: a test file was created in the current working directory by
   test_get_outputs in Distutils.