From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Fri, 26 Nov 2010 18:51:39 +0000 (+0000)
Subject: Fixed deprecation warnings.
X-Git-Tag: v3.2b1~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f75f5d506fff0fb7ff42b72817e49f3329f6f0e;p=thirdparty%2FPython%2Fcpython.git

Fixed deprecation warnings.
---

diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
index 6c1d4045cb4a..93df84f57cbf 100644
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -330,7 +330,7 @@ class TestCoverage(unittest.TestCase):
             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__)
+        modname = trace._fullmodname(sys.modules[modname].__file__)
         self.assertIn(modname, coverage)
         self.assertEqual(coverage[modname], (5, 100))
 
@@ -340,7 +340,7 @@ class TestCoverage(unittest.TestCase):
 class Test_Ignore(unittest.TestCase):
     def test_ignored(self):
         jn = os.path.join
-        ignore = trace.Ignore(['x', 'y.z'], [jn('foo', 'bar')])
+        ignore = trace._Ignore(['x', 'y.z'], [jn('foo', 'bar')])
         self.assertTrue(ignore.names('x.py', 'x'))
         self.assertFalse(ignore.names('xy.py', 'xy'))
         self.assertFalse(ignore.names('y.py', 'y'))