fix ftplib resource warnings

benjaminp · benjaminp · commit 1bd93a754fc0 · 2010-10-31T19:58:07.000Z
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
@@ -361,6 +361,7 @@ def ntransfercmd(self, cmd, rest=None):
             conn, sockaddr = sock.accept()
             if self.timeout is not _GLOBAL_DEFAULT_TIMEOUT:
                 conn.settimeout(self.timeout)
+            sock.close()
         if resp[:3] == '150':
             # this is conditional in case we received a 125
             size = parse150(resp)
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
@@ -355,6 +355,8 @@ def close(self):
             if (isinstance(self.socket, ssl.SSLSocket) and
                 self.socket._sslobj is not None):
                 self._do_ssl_shutdown()
+            else:
+                super(SSLConnection, self).close()
 
 
     class DummyTLS_DTPHandler(SSLConnection, DummyDTPHandler):
