diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2001-10-07 08:53:32 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2001-10-07 08:53:32 (GMT) |
| commit | 322c0d187d834013d70ffdb0f7f1b6f72eef6443 (patch) | |
| tree | ca8bbe6526e9f3c88b6311691e7936bfdc0480b0 /Lib/smtplib.py | |
| parent | fb163784ab8ec237fdc3bffd018efe653ae07a1d (diff) | |
| download | cpython-322c0d187d834013d70ffdb0f7f1b6f72eef6443.zip cpython-322c0d187d834013d70ffdb0f7f1b6f72eef6443.tar.gz cpython-322c0d187d834013d70ffdb0f7f1b6f72eef6443.tar.bz2 | |
Only close sockets if they have been created. Reported by Blake Winton.
Diffstat (limited to 'Lib/smtplib.py')
| -rwxr-xr-x | Lib/smtplib.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 4527a84..8e98608 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -265,6 +265,7 @@ class SMTP: if not port: port = SMTP_PORT if self.debuglevel > 0: print 'connect:', (host, port) msg = "getaddrinfo returns an empty list" + self.sock = None for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM): af, socktype, proto, canonname, sa = res try: @@ -273,7 +274,8 @@ class SMTP: self.sock.connect(sa) except socket.error, msg: if self.debuglevel > 0: print 'connect fail:', (host, port) - self.sock.close() + if self.sock: + self.sock.close() self.sock = None continue break |