bpo-37116: Use PEP 570 syntax for positional-only parameters. (GH-13700)
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 7b1e869..b363c63 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -86,23 +86,10 @@
_module_cleanups = []
-def addModuleCleanup(*args, **kwargs):
+def addModuleCleanup(function, /, *args, **kwargs):
"""Same as addCleanup, except the cleanup items are called even if
setUpModule fails (unlike tearDownModule)."""
- if args:
- function, *args = args
- elif 'function' in kwargs:
- function = kwargs.pop('function')
- import warnings
- warnings.warn("Passing 'function' as keyword argument is deprecated",
- DeprecationWarning, stacklevel=2)
- else:
- raise TypeError('addModuleCleanup expected at least 1 positional '
- 'argument, got %d' % (len(args)-1))
- args = tuple(args)
-
_module_cleanups.append((function, args, kwargs))
-addModuleCleanup.__text_signature__ = '(function, /, *args, **kwargs)'
def doModuleCleanups():
@@ -501,22 +488,11 @@
self._cleanups.append((function, args, kwargs))
addCleanup.__text_signature__ = '($self, function, /, *args, **kwargs)'
- def addClassCleanup(*args, **kwargs):
+ @classmethod
+ def addClassCleanup(cls, function, /, *args, **kwargs):
"""Same as addCleanup, except the cleanup items are called even if
setUpClass fails (unlike tearDownClass)."""
- if len(args) >= 2:
- cls, function, *args = args
- elif not args:
- raise TypeError("descriptor 'addClassCleanup' of 'TestCase' object "
- "needs an argument")
- else:
- raise TypeError('addClassCleanup expected at least 1 positional '
- 'argument, got %d' % (len(args)-1))
- args = tuple(args)
-
cls._class_cleanups.append((function, args, kwargs))
- addClassCleanup.__text_signature__ = '($cls, function, /, *args, **kwargs)'
- addClassCleanup = classmethod(addClassCleanup)
def setUp(self):
"Hook method for setting up the test fixture before exercising it."