Issue #26069: Remove the deprecated apis in the trace module.
This commit is contained in:
parent
f7272a667e
commit
96b531abd5
|
@ -1,11 +1,10 @@
|
|||
import os
|
||||
import io
|
||||
import sys
|
||||
from test.support import TESTFN, rmtree, unlink, captured_stdout
|
||||
import unittest
|
||||
|
||||
import trace
|
||||
from trace import CoverageResults, Trace
|
||||
from trace import Trace
|
||||
|
||||
from test.tracedmodules import testmod
|
||||
|
||||
|
@ -366,50 +365,5 @@ class Test_Ignore(unittest.TestCase):
|
|||
self.assertTrue(ignore.names(jn('bar', 'baz.py'), 'baz'))
|
||||
|
||||
|
||||
class TestDeprecatedMethods(unittest.TestCase):
|
||||
|
||||
def test_deprecated_usage(self):
|
||||
sio = io.StringIO()
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
trace.usage(sio)
|
||||
self.assertIn('Usage:', sio.getvalue())
|
||||
|
||||
def test_deprecated_Ignore(self):
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
trace.Ignore()
|
||||
|
||||
def test_deprecated_modname(self):
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
self.assertEqual("spam", trace.modname("spam"))
|
||||
|
||||
def test_deprecated_fullmodname(self):
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
self.assertEqual("spam", trace.fullmodname("spam"))
|
||||
|
||||
def test_deprecated_find_lines_from_code(self):
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
def foo():
|
||||
pass
|
||||
trace.find_lines_from_code(foo.__code__, ["eggs"])
|
||||
|
||||
def test_deprecated_find_lines(self):
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
def foo():
|
||||
pass
|
||||
trace.find_lines(foo.__code__, ["eggs"])
|
||||
|
||||
def test_deprecated_find_strings(self):
|
||||
with open(TESTFN, 'w') as fd:
|
||||
self.addCleanup(unlink, TESTFN)
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
trace.find_strings(fd.name)
|
||||
|
||||
def test_deprecated_find_executable_linenos(self):
|
||||
with open(TESTFN, 'w') as fd:
|
||||
self.addCleanup(unlink, TESTFN)
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
trace.find_executable_linenos(fd.name)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
43
Lib/trace.py
43
Lib/trace.py
|
@ -58,7 +58,6 @@ import inspect
|
|||
import gc
|
||||
import dis
|
||||
import pickle
|
||||
from warnings import warn as _warn
|
||||
from time import monotonic as _time
|
||||
|
||||
try:
|
||||
|
@ -810,47 +809,5 @@ def main(argv=None):
|
|||
if not no_report:
|
||||
results.write_results(missing, summary=summary, coverdir=coverdir)
|
||||
|
||||
# Deprecated API
|
||||
def usage(outfile):
|
||||
_warn("The trace.usage() function is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
_usage(outfile)
|
||||
|
||||
class Ignore(_Ignore):
|
||||
def __init__(self, modules=None, dirs=None):
|
||||
_warn("The class trace.Ignore is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
_Ignore.__init__(self, modules, dirs)
|
||||
|
||||
def modname(path):
|
||||
_warn("The trace.modname() function is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
return _modname(path)
|
||||
|
||||
def fullmodname(path):
|
||||
_warn("The trace.fullmodname() function is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
return _fullmodname(path)
|
||||
|
||||
def find_lines_from_code(code, strs):
|
||||
_warn("The trace.find_lines_from_code() function is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
return _find_lines_from_code(code, strs)
|
||||
|
||||
def find_lines(code, strs):
|
||||
_warn("The trace.find_lines() function is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
return _find_lines(code, strs)
|
||||
|
||||
def find_strings(filename, encoding=None):
|
||||
_warn("The trace.find_strings() function is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
return _find_strings(filename, encoding=None)
|
||||
|
||||
def find_executable_linenos(filename):
|
||||
_warn("The trace.find_executable_linenos() function is deprecated",
|
||||
DeprecationWarning, 2)
|
||||
return _find_executable_linenos(filename)
|
||||
|
||||
if __name__=='__main__':
|
||||
main()
|
||||
|
|
Loading…
Reference in New Issue