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)
........

diff --git a/Lib/nntplib.py b/Lib/nntplib.py
index cc51d1da8225045823b17ca276ba990eecd4c957..f519b06e55b0fbcbda7c29f5f0bfe94260139fbf 100644 (file)
--- a/Lib/nntplib.py
+++ b/Lib/nntplib.py
@@ -109,8 +109,7 @@ class NNTP:
         """
         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()

diff --git a/Misc/ACKS b/Misc/ACKS
index 4f25c56bf1e3042b6dd74a1b64b1f6333473c180..ac2b1a4b1aa1c78a83c3203743c98a92f0bcd61e 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -476,6 +476,7 @@ Doug Moen
 The Dragon De Monsyne
 Skip Montanaro
 Paul Moore
+Derek Morr
 James A Morrison
 Sjoerd Mullender
 Sape Mullender

diff --git a/Misc/NEWS b/Misc/NEWS
index 8107977d225ec55ac68cc041f7875cfd733c85e7..cfd72057b4f20c66a84c005756695663d072a4c6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -194,6 +194,8 @@ Core and Builtins
 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.