Merged revisions 76659 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76659 | r.david.murray | 2009-12-03 18:57:59 -0500 (Thu, 03 Dec 2009) | 4 lines

  Issue 7431: use TESTFN in test_linecache instead of trying to create a
  file in the Lib/test directory, which might be read-only for the
  user running the tests.
........

Lib/test/test_linecache.py

@@ -83,8 +83,8 @@ class LineCacheTests(unittest.TestCase):
         getline = linecache.getline
         try:
             # Create a source file and cache its contents
-            source_name = os.path.join(TEST_PATH, 'linecache_test.py')
+            source_name = support.TESTFN + '.py'
-            source = open(source_name, 'w')
+            with open(source_name, 'w') as source:
                 source.write(SOURCE_1)
                 source.close()
                 getline(source_name, 1)
@@ -114,11 +114,7 @@ class LineCacheTests(unittest.TestCase):
                 for index, line in enumerate(source):
                     self.assertEquals(line, getline(source_name, index + 1))
                     source_list.append(line)
-            source.close()
 
-        finally:
-            try:
-                source.close()
         finally:
             support.unlink(source_name)
 

Misc/NEWS

@@ -101,6 +101,10 @@ Build
 Tests
 -----
 
+- Issue #7431: use TESTFN in test_linecache instead of trying to create a 
+  file in the Lib/test directory, which might be read-only for the
+  user running the tests.
+
 - Issue #7324: add a sanity check to regrtest argument parsing to
   catch the case of an option with no handler.