diff --git a/Lib/nntplib.py b/Lib/nntplib.py index 4d7f9fd8cb6..6ac2fcb9949 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 83dd3ad7bd1..8a86f734ed4 100644 --- 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 b80f7b3e267..0c28db06853 100644 --- 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