From: Senthil Kumaran <senthil@uthcode.com>
Date: Sun, 26 Jun 2011 20:45:17 +0000 (-0700)
Subject: Fix closes issue1067702  The problem with close multiple ftp transfers were due cases... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4ef72687972a6e1aedafeb1a5f7de1dd4b5756d;p=python

Fix closes issue1067702  The problem with close multiple ftp transfers were due cases where sockets/file were not closed immediately. Tightned those cases and failure is no longer observed.
---

diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 72d31a15e3..8713e473a1 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -351,6 +351,7 @@ class FTP:
             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)
@@ -575,11 +576,11 @@ class FTP:
 
     def close(self):
         '''Close the connection without assuming anything about it.'''
-        if self.file:
+        if self.file is not None:
             self.file.close()
+        if self.sock is not None:
             self.sock.close()
-            self.file = self.sock = None
-
+        self.file = self.sock = None
 
 try:
     import ssl