Fix issue #16270: urllib may hang when used for retrieving files via FTP by using...

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 67b4c795b36edc3af28d271c9c566f41216c09f9..88f3ce1a26a7ba0441519dbcc3db4744af921865 100644 (file)
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -2326,13 +2326,7 @@ class ftpwrapper:
         return (ftpobj, retrlen)
 
     def endtransfer(self):
-        if not self.busy:
-            return
         self.busy = 0
-        try:
-            self.ftp.voidresp()
-        except ftperrors():
-            pass
 
     def close(self):
         self.keepalive = False

diff --git a/Misc/NEWS b/Misc/NEWS
index 228db08c6f046749e9fd57ab544e77022c4039d6..98c8749847cab4b61cfc07f84e708c987b8509e5 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #16270: urllib may hang when used for retrieving files via FTP by using
+  a context manager.  Patch by Giampaolo Rodola'.
+
 - Issue #16176: Properly identify Windows 8 via platform.platform()
 
 - Issue #16114: The subprocess module no longer provides a misleading error