diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2019-04-01 06:16:35 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-01 06:16:35 (GMT) |
commit | 42a139ed88c487f325a241c6ee8b308b3c045975 (patch) | |
tree | de56527188eff240b06496c3451e525af959dcad /Lib/functools.py | |
parent | 5f2c50810a67982b0c80f6d3258fee3647f67005 (diff) | |
download | cpython-42a139ed88c487f325a241c6ee8b308b3c045975.zip cpython-42a139ed88c487f325a241c6ee8b308b3c045975.tar.gz cpython-42a139ed88c487f325a241c6ee8b308b3c045975.tar.bz2 |
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.
Diffstat (limited to 'Lib/functools.py')
-rw-r--r-- | Lib/functools.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Lib/functools.py b/Lib/functools.py index 426653f..1f1874d 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -354,7 +354,23 @@ class partialmethod(object): callables as instance methods. """ - def __init__(self, func, *args, **keywords): + def __init__(*args, **keywords): + if len(args) >= 2: + self, func, *args = args + elif not args: + raise TypeError("descriptor '__init__' of partialmethod " + "needs an argument") + elif 'func' in keywords: + func = keywords.pop('func') + self, *args = args + import warnings + warnings.warn("Passing 'func' as keyword argument is deprecated", + DeprecationWarning, stacklevel=2) + else: + raise TypeError("type 'partialmethod' takes at least one argument, " + "got %d" % (len(args)-1)) + args = tuple(args) + if not callable(func) and not hasattr(func, "__get__"): raise TypeError("{!r} is not callable or a descriptor" .format(func)) |