From 7b53236925ca11e4d89f74c2277fc5fdaa5ff758 Mon Sep 17 00:00:00 2001 From: Jana Cupova Date: Nov 20 2022 08:32:23 +0000 Subject: Use inspect.getfullargspec instead of getargspec on hub and web Fxes: https://pagure.io/koji/issue/3591 --- diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py index d14c1e1..d98d85c 100644 --- a/hub/kojixmlrpc.py +++ b/hub/kojixmlrpc.py @@ -117,10 +117,10 @@ class HandlerRegistry(object): ret = self.argspec_cache.get(func) if ret: return ret - ret = tuple(inspect.getargspec(func)) + ret = tuple(inspect.getfullargspec(func)) if inspect.ismethod(func) and func.__self__: # bound method, remove first arg - args, varargs, varkw, defaults = ret + args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, ann = ret if args: aname = args[0] # generally "self" del args[0] diff --git a/www/kojiweb/wsgi_publisher.py b/www/kojiweb/wsgi_publisher.py index 4d46a6b..2316f96 100644 --- a/www/kojiweb/wsgi_publisher.py +++ b/www/kojiweb/wsgi_publisher.py @@ -216,7 +216,7 @@ class Dispatcher(object): if not inspect.isfunction(val): continue # err on the side of paranoia - args = inspect.getargspec(val) + args = inspect.getfullargspec(val) if not args[0] or args[0][0] != 'environ': continue except Exception: @@ -257,7 +257,8 @@ class Dispatcher(object): if isinstance(val, list) and len(val) == 1: data[arg] = val[0] environ['koji.form'] = fs - args, varargs, varkw, defaults = inspect.getargspec(func) + args, varargs, varkw, defaults, kwonlyargs, kwonlydefaults, ann = \ + inspect.getfullargspec(func) if not varkw: # remove any unexpected args data = dslice(data, args, strict=False)