[Python-checkins] cpython (2.7): Closes issue26960.

[senthil.kumaran]

https://hg.python.org/cpython/rev/44d02a5d59fb
changeset:   101286:44d02a5d59fb
branch:      2.7
parent:      101280:1662b41e1663
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue May 10 01:12:55 2016 -0700
summary:
  Closes issue26960.

Backport issue16270: Fix for urllib hanging with ftp urls.

files:
  Lib/urllib.py |  6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)


diff --git a/Lib/urllib.py b/Lib/urllib.py
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -932,13 +932,7 @@
         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

-- 
Repository URL: https://hg.python.org/cpython