From b6da0006ca816d503f6b791daed9d2f96891da8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 24 Jul 2001 20:34:08 +0000 Subject: Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients. --- Lib/poplib.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'Lib/poplib.py') diff --git a/Lib/poplib.py b/Lib/poplib.py index fb24a0f9c5..c6c432dcf3 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): -- cgit v1.2.1