Merged revisions 85000 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85000 | alexander.belopolsky | 2010-09-24 18:04:22 -0400 (Fri, 24 Sep 2010) | 1 line

  This should fix buildbot failure introduced by r84994
........

diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
index 472480f3c670e9570e809077ded91943000473cc..3b6c614e355f873207f0973d5f77959f7646233f 100644 (file)
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -327,6 +327,8 @@ class TestCoverage(unittest.TestCase):
         for line in stdout:
             lines, cov, module = line.split()[:3]
             coverage[module] = (int(lines), int(cov[:-1]))
+        # XXX This is needed to run regrtest.py as a script
+        modname = trace.fullmodname(sys.modules[modname].__file__)
         self.assertIn(modname, coverage)
         self.assertEqual(coverage[modname], (5, 100))