From: Senthil Kumaran <senthil@uthcode.com>
Date: Thu, 15 Mar 2012 20:24:40 +0000 (-0700)
Subject: Fix the urllib closing issue which hangs on particular ftp urls/ftp servers. closes... 
X-Git-Tag: v2.7.4rc1~963
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c59211bd5b136880bb3b5c6aef033e2b62c1019;p=thirdparty%2FPython%2Fcpython.git

Fix the urllib closing issue which hangs on particular ftp urls/ftp servers. closes issue11199
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index a73c5d7ba518..33641a570012 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -980,11 +980,11 @@ class addclosehook(addbase):
         self.hookargs = hookargs
 
     def close(self):
-        addbase.close(self)
         if self.closehook:
             self.closehook(*self.hookargs)
             self.closehook = None
             self.hookargs = None
+        addbase.close(self)
 
 class addinfo(addbase):
     """class to add an info() method to an open file."""
diff --git a/Misc/NEWS b/Misc/NEWS
index 3b162bc679df..376d8d31eb4c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #11199: Fix the with urllib which hangs on particular ftp urls.
+
 - Issue #5219: Prevent event handler cascade in IDLE.
 
 - Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under