[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/9afdd8c25bf2
changeset:   78003:9afdd8c25bf2
parent:      78001:45265ecaa3e4
parent:      78002:76e7ae9eb569
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Jul 08 14:00:06 2012 +0200
summary:
  Merge

files:
  Lib/test/test_inspect.py |  12 +++++++++---
  1 files changed, 9 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -285,7 +285,10 @@
         co = compile("None", fn, "exec")
         self.assertEqual(inspect.getsourcefile(co), None)
         linecache.cache[co.co_filename] = (1, None, "None", co.co_filename)
-        self.assertEqual(normcase(inspect.getsourcefile(co)), fn)
+        try:
+            self.assertEqual(normcase(inspect.getsourcefile(co)), fn)
+        finally:
+            del linecache.cache[co.co_filename]
 
     def test_getfile(self):
         self.assertEqual(inspect.getfile(mod.StupidGit), mod.__file__)
@@ -407,8 +410,11 @@
         self.assertRaises(IOError, inspect.findsource, co)
         self.assertRaises(IOError, inspect.getsource, co)
         linecache.cache[co.co_filename] = (1, None, lines, co.co_filename)
-        self.assertEqual(inspect.findsource(co), (lines,0))
-        self.assertEqual(inspect.getsource(co), lines[0])
+        try:
+            self.assertEqual(inspect.findsource(co), (lines,0))
+            self.assertEqual(inspect.getsource(co), lines[0])
+        finally:
+            del linecache.cache[co.co_filename]
 
 class TestNoEOL(GetSourceBase):
     def __init__(self, *args, **kwargs):

-- 
Repository URL: http://hg.python.org/cpython