From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 10 May 2016 08:12:55 +0000 (-0700)
Subject: Closes issue26960.
X-Git-Tag: v2.7.12rc1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5a67dec9841b62e4fb4728ff754323592946f17;p=thirdparty%2FPython%2Fcpython.git

Closes issue26960.

Backport issue16270: Fix for urllib hanging with ftp urls.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index 055707ff1efa..139fab907ef0 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -932,13 +932,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