Only close sockets if they have been created. Reported by Blake Winton.

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 4aa6244c5e977161b84c5523ee5410e06f8648b0..4d5ac1abd1f59f98548d509a09cba5dc20777af4 100644 (file)
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -122,7 +122,8 @@ class FTP:
                 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
@@ -272,13 +273,15 @@ class FTP:
     def makeport(self):
         '''Create a new socket and send a PORT command for it.'''
         msg = "getaddrinfo returns an empty list"
+        sock = None
         for res in socket.getaddrinfo(None, 0, self.af, socket.SOCK_STREAM, 0, socket.AI_PASSIVE):
             af, socktype, proto, canonname, sa = res
             try:
                 sock = socket.socket(af, socktype, proto)
                 sock.bind(sa)
             except socket.error, msg:
-                sock.close()
+                if sock:
+                    sock.close()
                 sock = None
                 continue
             break

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 0e0ec56d28eb3eb0584f28b933c0302a423e6f12..fa63787ef6dc44c5242bccc438e5cc67c2d47b69 100644 (file)
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -368,7 +368,8 @@ class HTTPConnection:
             except socket.error, msg:
                 if self.debuglevel > 0:
                     print 'connect fail:', (self.host, self.port)
-                self.sock.close()
+                if self.sock:
+                    self.sock.close()
                 self.sock = None
                 continue
             break

diff --git a/Lib/poplib.py b/Lib/poplib.py
index 98b81ce620e42b4160c1e0357f5c943a393a20a0..cb3e00464089be45dd448d75f61711f963038e11 100644 (file)
--- 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

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 4527a846b94fcd6da956393499e0d1f6763055c6..8e9860805315dca6a2ff206cfabf9a572ac8a243 100755 (executable)
--- 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

diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index c8ddd972cec58bff678887dd1be4d99a19f19fe0..15721c6e6f44b3c940d312e190a3f0877d11de93 100644 (file)
--- a/Lib/telnetlib.py
+++ b/Lib/telnetlib.py
@@ -210,7 +210,8 @@ class Telnet:
                 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