issue10883 - Silence some ftp related ResourceWarnings in test_urllib2net. Patch by Nadeem Vawda

orsenthil · orsenthil · commit e6ead3905d5a · 2011-03-24T11:47:29.000+08:00
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
@@ -2136,7 +2136,7 @@ def retrfile(self, file, type):
             # Try to retrieve as a file
             try:
                 cmd = 'RETR ' + file
-                conn = self.ftp.ntransfercmd(cmd)
+                conn, retrlen = self.ftp.ntransfercmd(cmd)
             except ftplib.error_perm as reason:
                 if str(reason)[:3] != '550':
                     raise URLError('ftp error', reason).with_traceback(
@@ -2157,10 +2157,14 @@ def retrfile(self, file, type):
                 cmd = 'LIST ' + file
             else:
                 cmd = 'LIST'
-            conn = self.ftp.ntransfercmd(cmd)
+            conn, retrlen = self.ftp.ntransfercmd(cmd)
         self.busy = 1
+
+        ftpobj = addclosehook(conn.makefile('rb'), self.endtransfer)
+        conn.close()
         # Pass back both a suitably decorated object and a retrieval length
-        return (addclosehook(conn[0].makefile('rb'), self.endtransfer), conn[1])
+        return (ftpobj, retrlen)
+
     def endtransfer(self):
         if not self.busy:
             return
