From: Philip Jenvey <pjenvey@underboss.org>
Date: Thu, 3 Dec 2009 02:40:13 +0000 (+0000)
Subject: actually close files
X-Git-Tag: v2.7a1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0299d0d7f03653400a563e69d6d2e062cf47320a;p=thirdparty%2FPython%2Fcpython.git

actually close files
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index db8e6160d450..1c31d48f9c31 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -231,7 +231,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, msg:
                 pass
@@ -275,8 +275,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:
@@ -1570,9 +1568,8 @@ def test(args=[]):
                 print '======'
                 for k in h.keys(): print k + ':', h[k]
                 print '======'
-            fp = open(fn, 'rb')
-            data = fp.read()
-            del fp
+            with open(fn, 'rb') as fp:
+                data = fp.read()
             if '\r' in data:
                 table = string.maketrans("", "")
                 data = data.translate(table, "\r")