From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 25 Mar 2008 06:35:10 +0000 (+0000)
Subject: Don't try to close a non-open file.
X-Git-Tag: v2.6a2~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be9160b035449b00ff4aee1837c510ec518b08bc;p=python

Don't try to close a non-open file.
Don't let file removal cause the test to fail.
---

diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index 3d09d87fdb..6b3df3dd65 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -283,15 +283,15 @@ class TestJointOps(unittest.TestCase):
         w = ReprWrapper()
         s = self.thetype([w])
         w.value = s
+        fo = open(test_support.TESTFN, "wb")
         try:
-            fo = open(test_support.TESTFN, "wb")
             print >> fo, s,
             fo.close()
             fo = open(test_support.TESTFN, "rb")
             self.assertEqual(fo.read(), repr(s))
         finally:
             fo.close()
-            os.remove(test_support.TESTFN)
+            test_support.unlink(test_support.TESTFN)
 
     def test_do_not_rehash_dict_keys(self):
         n = 10
@@ -626,15 +626,15 @@ class TestBasicOps(unittest.TestCase):
             self.assertEqual(repr(self.set), self.repr)
 
     def test_print(self):
+        fo = open(test_support.TESTFN, "wb")
         try:
-            fo = open(test_support.TESTFN, "wb")
             print >> fo, self.set,
             fo.close()
             fo = open(test_support.TESTFN, "rb")
             self.assertEqual(fo.read(), repr(self.set))
         finally:
             fo.close()
-            os.remove(test_support.TESTFN)
+            test_support.unlink(test_support.TESTFN)
 
     def test_length(self):
         self.assertEqual(len(self.set), self.length)