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 4d7f9fd8cb698da78c714895c9246b9cd614f790..6ac2fcb9949b7eb22f679a813365e7fa6d9749d9 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 83dd3ad7bd1c7863b86d35ea7041af78940d7073..8a86f734ed4b36065fb04121719045e46a0695ee 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -496,6 +496,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 b80f7b3e267ab03cc698123a5e3e300e22873673..0c28db068531780bafec064df20bc1e86a6c0de3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,8 @@ Core and Builtins
 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