From c71e87e34f4eb09ea8c7f84d999ea92ef8624874 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Mon, 26 Jun 2023 09:50:43 +0100 Subject: [PATCH] Updated to fix deprecated inspect.getargspec --- gprMax/cmds_multiuse.py | 5 +++-- gprMax/cmds_singleuse.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gprMax/cmds_multiuse.py b/gprMax/cmds_multiuse.py index 9fb768cc..e7f68ee3 100644 --- a/gprMax/cmds_multiuse.py +++ b/gprMax/cmds_multiuse.py @@ -154,8 +154,9 @@ class Waveform(UserObjectMulti): try: uservalues = self.kwargs['user_values'] ID = self.kwargs['id'] - args, varargs, keywords, defaults = inspect.getargspec(interpolate.interp1d) - kwargs = dict(zip(reversed(args), reversed(defaults))) + fullargspec = inspect.getfullargspec(interpolate.interp1d) + kwargs = dict(zip(reversed(fullargspec.args), + reversed(fullargspec.defaults))) except KeyError: logger.exception(self.params_str() + (' a user-defined ' 'waveform requires at least two parameters.')) diff --git a/gprMax/cmds_singleuse.py b/gprMax/cmds_singleuse.py index ed722d37..f65a68ca 100644 --- a/gprMax/cmds_singleuse.py +++ b/gprMax/cmds_singleuse.py @@ -389,8 +389,9 @@ class ExcitationFile(UserObjectSingle): except KeyError: try: excitationfile = self.kwargs['filepath'] - args, varargs, keywords, defaults = inspect.getargspec(interpolate.interp1d) - kwargs = dict(zip(reversed(args), reversed(defaults))) + fullargspec = inspect.getfullargspec(interpolate.interp1d) + kwargs = dict(zip(reversed(fullargspec.args), + reversed(fullargspec.defaults))) except KeyError: logger.exception(f'{self.__str__()} requires either one or three parameter(s)') raise