Merge branch 'devel' of https://github.com/gprMax/gprMax into fix_1

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)
+                fullargspec = inspect.getfullargspec(interpolate.interp1d)
-                kwargs = dict(zip(reversed(args), reversed(defaults)))
+                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.'))

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)
+                fullargspec = inspect.getfullargspec(interpolate.interp1d)
-                kwargs = dict(zip(reversed(args), reversed(defaults)))
+                kwargs = dict(zip(reversed(fullargspec.args), 
+                                  reversed(fullargspec.defaults)))
             except KeyError:
                 logger.exception(f'{self.__str__()} requires either one or three parameter(s)')
                 raise