From: Philip Jenvey <pjenvey@underboss.org>
Date: Thu, 3 Dec 2009 02:45:01 +0000 (+0000)
Subject: Recorded merge of revisions 76642 via svnmerge from
X-Git-Tag: v3.2a1~2092
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb134d7d88baf08b9edcc4bf653be95bb2718bd2;p=python

Recorded merge of revisions 76642 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76642 | philip.jenvey | 2009-12-02 18:40:13 -0800 (Wed, 02 Dec 2009) | 1 line

  actually close files
........
---

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index d669aec54e..6c7215219c 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1471,7 +1471,7 @@ class URLopener:
             try:
                 fp = self.open_local_file(url1)
                 hdrs = fp.info()
-                del fp
+                fp.close()
                 return url2pathname(splithost(url1)[1]), hdrs
             except IOError as msg:
                 pass
@@ -1515,8 +1515,6 @@ class URLopener:
                 tfp.close()
         finally:
             fp.close()
-        del fp
-        del tfp
 
         # raise exception if actual size does not match content-length header
         if size >= 0 and read < size: