summaryrefslogtreecommitdiff
path: root/Lib/poplib.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2001-10-07 08:53:32 +0000
committerMartin v. Löwis <martin@v.loewis.de>2001-10-07 08:53:32 +0000
commit6b37360de0012a765b220e81a8f2f58f6b710c5f (patch)
treedad55b5f9cd26c224f4f62f580eaf78b9c8c397e /Lib/poplib.py
parent3d4c935b919a7694e06742cc9cb974d22cb57233 (diff)
downloadcpython-6b37360de0012a765b220e81a8f2f58f6b710c5f.tar.gz
Only close sockets if they have been created. Reported by Blake Winton.
Diffstat (limited to 'Lib/poplib.py')
-rw-r--r--Lib/poplib.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/poplib.py b/Lib/poplib.py
index 98b81ce620..cb3e004640 100644
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -76,13 +76,15 @@ class POP3:
self.host = host
self.port = port
msg = "getaddrinfo returns an empty list"
+ self.sock = None
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()
+ if self.sock:
+ self.sock.close()
self.sock = None
continue
break