mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
bpo-36492: Deprecate passing some arguments as keyword arguments. (GH-12637)
Deprecated passing the following arguments as keyword arguments: - "func" in functools.partialmethod(), weakref.finalize(), profile.Profile.runcall(), cProfile.Profile.runcall(), bdb.Bdb.runcall(), trace.Trace.runfunc() and curses.wrapper(). - "function" in unittest.addModuleCleanup() and unittest.TestCase.addCleanup(). - "fn" in the submit() method of concurrent.futures.ThreadPoolExecutor and concurrent.futures.ProcessPoolExecutor. - "callback" in contextlib.ExitStack.callback(), contextlib.AsyncExitStack.callback() and contextlib.AsyncExitStack.push_async_callback(). - "c" and "typeid" in the create() method of multiprocessing.managers.Server and multiprocessing.managers.SharedMemoryServer. - "obj" in weakref.finalize(). Also allowed to pass arbitrary keyword arguments (even "self" and "func") if the above arguments are passed as positional argument.
This commit is contained in:
parent
5f2c50810a
commit
42a139ed88
22 changed files with 457 additions and 21 deletions
|
@ -403,6 +403,22 @@ class TestModuleCleanUp(unittest.TestCase):
|
|||
self.assertEqual(str(e.exception), 'CleanUpExc')
|
||||
self.assertEqual(unittest.case._module_cleanups, [])
|
||||
|
||||
def test_addModuleCleanup_arg_errors(self):
|
||||
cleanups = []
|
||||
def cleanup(*args, **kwargs):
|
||||
cleanups.append((args, kwargs))
|
||||
|
||||
class Module(object):
|
||||
unittest.addModuleCleanup(cleanup, 1, 2, function='hello')
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
unittest.addModuleCleanup(function=cleanup, arg='hello')
|
||||
with self.assertRaises(TypeError):
|
||||
unittest.addModuleCleanup()
|
||||
unittest.case.doModuleCleanups()
|
||||
self.assertEqual(cleanups,
|
||||
[((), {'arg': 'hello'}),
|
||||
((1, 2), {'function': 'hello'})])
|
||||
|
||||
def test_run_module_cleanUp(self):
|
||||
blowUp = True
|
||||
ordering = []
|
||||
|
@ -547,6 +563,50 @@ class TestModuleCleanUp(unittest.TestCase):
|
|||
'tearDownModule', 'cleanup_good'])
|
||||
self.assertEqual(unittest.case._module_cleanups, [])
|
||||
|
||||
def test_addClassCleanup_arg_errors(self):
|
||||
cleanups = []
|
||||
def cleanup(*args, **kwargs):
|
||||
cleanups.append((args, kwargs))
|
||||
|
||||
class TestableTest(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.addClassCleanup(cleanup, 1, 2, function=3, cls=4)
|
||||
with self.assertRaises(TypeError):
|
||||
cls.addClassCleanup(function=cleanup, arg='hello')
|
||||
def testNothing(self):
|
||||
pass
|
||||
|
||||
with self.assertRaises(TypeError):
|
||||
TestableTest.addClassCleanup()
|
||||
with self.assertRaises(TypeError):
|
||||
unittest.TestCase.addCleanup(cls=TestableTest(), function=cleanup)
|
||||
runTests(TestableTest)
|
||||
self.assertEqual(cleanups,
|
||||
[((1, 2), {'function': 3, 'cls': 4})])
|
||||
|
||||
def test_addCleanup_arg_errors(self):
|
||||
cleanups = []
|
||||
def cleanup(*args, **kwargs):
|
||||
cleanups.append((args, kwargs))
|
||||
|
||||
class TestableTest(unittest.TestCase):
|
||||
def setUp(self2):
|
||||
self2.addCleanup(cleanup, 1, 2, function=3, self=4)
|
||||
with self.assertWarns(DeprecationWarning):
|
||||
self2.addCleanup(function=cleanup, arg='hello')
|
||||
def testNothing(self):
|
||||
pass
|
||||
|
||||
with self.assertRaises(TypeError):
|
||||
TestableTest().addCleanup()
|
||||
with self.assertRaises(TypeError):
|
||||
unittest.TestCase.addCleanup(self=TestableTest(), function=cleanup)
|
||||
runTests(TestableTest)
|
||||
self.assertEqual(cleanups,
|
||||
[((), {'arg': 'hello'}),
|
||||
((1, 2), {'function': 3, 'self': 4})])
|
||||
|
||||
def test_with_errors_in_addClassCleanup(self):
|
||||
ordering = []
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue