Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients.

1 files changed, 17 insertions, 7 deletions

diff --git a/Lib/poplib.py b/Lib/poplib.py
index fb24a0f..c6c432d 100644
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -73,13 +73,23 @@ class POP3:
 
 
     def __init__(self, host, port = POP3_PORT):
-        self.host = host
-        self.port = port
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.sock.connect((self.host, self.port))
-        self.file = self.sock.makefile('rb')
-        self._debugging = 0
-        self.welcome = self._getresp()
+	self.host = host
+	self.port = port
+	for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
+	    af, socktype, proto, canonname, sa = res
+	    try:
+		self.sock = socket.socket(af, socktype, proto)
+		self.sock.connect(sa)
+	    except socket.error, msg:
+		self.sock.close()
+		self.sock = None
+		continue
+	    break
+	if not self.sock:
+	    raise socket.error, msg
+	self.file = self.sock.makefile('rb')
+	self._debugging = 0
+	self.welcome = self._getresp()
 
 
     def _putline(self, line):