From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 14 May 2009 21:27:08 +0000 (+0000)
Subject: Merged revisions 72640 via svnmerge from
X-Git-Tag: v2.6.3rc1~283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05c8232dbcf47be592b1b7216b76a5180a88a9c3;p=python

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 cc51d1da82..f519b06e55 100644
--- 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 4f25c56bf1..ac2b1a4b1a 100644
--- 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 8107977d22..cfd72057b4 100644
--- 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.