diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-09-01 13:32:35 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-01 13:32:35 (GMT) |
commit | 56683097f4092933545758f020acf173c5cb3926 (patch) | |
tree | 603adb4dd91adbb8f05d6fa91a32033d6cb13cbf /Lib/turtle.py | |
parent | 1e15c1501c51f03123ec0da3fa430f2286bac40c (diff) | |
download | cpython-56683097f4092933545758f020acf173c5cb3926.zip cpython-56683097f4092933545758f020acf173c5cb3926.tar.gz cpython-56683097f4092933545758f020acf173c5cb3926.tar.bz2 |
[3.12] gh-107805: Fix signatures of module-level generated functions in `turtle` (GH-107807) (#108749)
gh-107805: Fix signatures of module-level generated functions in `turtle` (GH-107807)
(cherry picked from commit 044b8b3b6a65e6651b161e3badfa5d57c666db19)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Diffstat (limited to 'Lib/turtle.py')
-rw-r--r-- | Lib/turtle.py | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/Lib/turtle.py b/Lib/turtle.py index cf11115..811c5df 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -3951,28 +3951,33 @@ def getmethparlist(ob): function definition and the second is suitable for use in function call. The "self" parameter is not included. """ - defText = callText = "" + orig_sig = inspect.signature(ob) # bit of a hack for methods - turn it into a function # but we drop the "self" param. # Try and build one for Python defined functions - args, varargs, varkw = inspect.getargs(ob.__code__) - items2 = args[1:] - realArgs = args[1:] - defaults = ob.__defaults__ or [] - defaults = ["=%r" % (value,) for value in defaults] - defaults = [""] * (len(realArgs)-len(defaults)) + defaults - items1 = [arg + dflt for arg, dflt in zip(realArgs, defaults)] - if varargs is not None: - items1.append("*" + varargs) - items2.append("*" + varargs) - if varkw is not None: - items1.append("**" + varkw) - items2.append("**" + varkw) - defText = ", ".join(items1) - defText = "(%s)" % defText - callText = ", ".join(items2) - callText = "(%s)" % callText - return defText, callText + func_sig = orig_sig.replace( + parameters=list(orig_sig.parameters.values())[1:], + ) + + call_args = [] + for param in func_sig.parameters.values(): + match param.kind: + case ( + inspect.Parameter.POSITIONAL_ONLY + | inspect.Parameter.POSITIONAL_OR_KEYWORD + ): + call_args.append(param.name) + case inspect.Parameter.VAR_POSITIONAL: + call_args.append(f'*{param.name}') + case inspect.Parameter.KEYWORD_ONLY: + call_args.append(f'{param.name}={param.name}') + case inspect.Parameter.VAR_KEYWORD: + call_args.append(f'**{param.name}') + case _: + raise RuntimeError('Unsupported parameter kind', param.kind) + call_text = f'({', '.join(call_args)})' + + return str(func_sig), call_text def _turtle_docrevise(docstr): """To reduce docstrings from RawTurtle class for functions |