summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-05-14 21:30:46 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-05-14 21:30:46 (GMT)
commit2ca24f022ed226cbe48012b5ea82da36025f33f2 (patch)
tree3e3a766a9d621b0682c54c7345917380bbf9c2e0
parent4210c6edcaf85ca2675c436a0992ab6e96f3d165 (diff)
downloadcpython-2ca24f022ed226cbe48012b5ea82da36025f33f2.zip
cpython-2ca24f022ed226cbe48012b5ea82da36025f33f2.tar.gz
cpython-2ca24f022ed226cbe48012b5ea82da36025f33f2.tar.bz2
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) ........
-rw-r--r--Lib/nntplib.py3
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
3 files changed, 4 insertions, 2 deletions
diff --git a/Lib/nntplib.py b/Lib/nntplib.py
index 4d7f9fd..6ac2fcb 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 83dd3ad..8a86f73 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 b80f7b3..0c28db0 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