diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2019-04-01 07:59:24 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-01 07:59:24 (GMT) |
commit | a37f356de19828241bf19129f804369794c72ed3 (patch) | |
tree | 8d91421e049ae0a2781ff6c5b3a2352c3ec89071 /Lib/weakref.py | |
parent | 5e233951d931acc0e927100c51e9a27a2791b6a5 (diff) | |
download | cpython-a37f356de19828241bf19129f804369794c72ed3.zip cpython-a37f356de19828241bf19129f804369794c72ed3.tar.gz cpython-a37f356de19828241bf19129f804369794c72ed3.tar.bz2 |
[3.7] bpo-36492: Fix passing special keyword arguments to some functions. (GH-12637) (GH-12645)
The following arguments can be passed as keyword arguments for passing
to other function if the corresponding required argument is passed as
positional:
- "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 multiprocessing.managers.Server.create().
- "obj" in weakref.finalize().
(cherry picked from commit 42a139ed88c487f325a241c6ee8b308b3c045975)
Diffstat (limited to 'Lib/weakref.py')
-rw-r--r-- | Lib/weakref.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/Lib/weakref.py b/Lib/weakref.py index 753f072..59b3aa5 100644 --- a/Lib/weakref.py +++ b/Lib/weakref.py @@ -527,7 +527,27 @@ class finalize: class _Info: __slots__ = ("weakref", "func", "args", "kwargs", "atexit", "index") - def __init__(self, obj, func, *args, **kwargs): + def __init__(*args, **kwargs): + if len(args) >= 3: + self, obj, func, *args = args + elif not args: + raise TypeError("descriptor '__init__' of 'finalize' object " + "needs an argument") + else: + if 'func' not in kwargs: + raise TypeError('finalize expected at least 2 positional ' + 'arguments, got %d' % (len(args)-1)) + func = kwargs.pop('func') + if len(args) >= 2: + self, obj, *args = args + else: + if 'obj' not in kwargs: + raise TypeError('finalize expected at least 2 positional ' + 'arguments, got %d' % (len(args)-1)) + obj = kwargs.pop('obj') + self, *args = args + args = tuple(args) + if not self._registered_with_atexit: # We may register the exit function more than once because # of a thread race, but that is harmless |