summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-03-15 20:26:12 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-03-15 20:26:12 (GMT)
commit73277fe0ebd07b470e43804c24282a4947a63341 (patch)
tree23510ccea0e27b5615f59ffbebaaef34e54fa4d5
parent38c27546520fea63bc7efb031f2a6255506d2c5c (diff)
downloadcpython-73277fe0ebd07b470e43804c24282a4947a63341.zip
cpython-73277fe0ebd07b470e43804c24282a4947a63341.tar.gz
cpython-73277fe0ebd07b470e43804c24282a4947a63341.tar.bz2
closes Issue #11199: Fix the with urllib which hangs on particular ftp urls.
-rw-r--r--Lib/urllib/response.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/urllib/response.py b/Lib/urllib/response.py
index 8c6dcca..ffaa5fa 100644
--- a/Lib/urllib/response.py
+++ b/Lib/urllib/response.py
@@ -61,11 +61,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 1b4e09f..65b22e6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,8 @@ Core and Builtins
Library
-------
+- Issue #11199: Fix the with urllib which hangs on particular ftp urls.
+
- Issue #14062: Header objects now correctly respect the 'linesep' setting
when processed by BytesParser (which smtplib.SMTP.send_message uses).