[pypy-svn] pypy default: Review the usage of tmpname in this file, trying to close all

arigo commits-noreply at bitbucket.org
Mon Dec 27 13:42:18 CET 2010


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r40238:440a5baa6695
Date: 2010-12-27 13:41 +0100
http://bitbucket.org/pypy/pypy/changeset/440a5baa6695/

Log:	Review the usage of tmpname in this file, trying to close all open
	files. (Necessary on Windows for os.remove() to succeed)

diff --git a/lib-python/modified-2.5.2/test/test_tarfile.py b/lib-python/modified-2.5.2/test/test_tarfile.py
--- a/lib-python/modified-2.5.2/test/test_tarfile.py
+++ b/lib-python/modified-2.5.2/test/test_tarfile.py
@@ -458,7 +458,9 @@
             f.close()
         elif self.comp == "bz2":
             f = bz2.BZ2Decompressor()
-            s = file(self.dstname).read()
+            g = file(self.dstname)
+            s = g.read()
+            g.close()
             s = f.decompress(s)
             self.assertEqual(len(f.unused_data), 0, "trailing data")
         else:
@@ -531,6 +533,7 @@
         self.assert_(tarinfo.name == member.name and \
                      tarinfo.linkname == member.linkname, \
                      "unable to read longname member")
+        tar.close()
 
     def test_longname_1023(self):
         self._test(("longnam/" * 127) + "longnam")


More information about the Pypy-commit mailing list