check for unused keywords

murrayrm · murrayrm · commit 8b6bfd199de4 · 2022-03-29T22:26:44.000-07:00
diff --git a/control/frdata.py b/control/frdata.py
@@ -150,7 +150,11 @@ def __init__(self, *args, **kwargs):
 
         """
         # TODO: discrete-time FRD systems?
-        smooth = kwargs.get('smooth', False)
+        smooth = kwargs.pop('smooth', False)
+
+        # Make sure there were no extraneous keywords
+        if kwargs:
+            raise TypeError("unrecognized keywords: ", str(kwargs))
 
         if len(args) == 2:
             if not isinstance(args[0], FRD) and isinstance(args[0], LTI):
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -221,12 +221,10 @@ def bode_plot(syslist, omega=None,
         # Get the current figure
 
         if 'sisotool' in kwargs:
-            fig = kwargs['fig']
+            fig = kwargs.pop('fig')
             ax_mag = fig.axes[0]
             ax_phase = fig.axes[2]
-            sisotool = kwargs['sisotool']
-            del kwargs['fig']
-            del kwargs['sisotool']
+            sisotool = kwargs.pop('sisotool')
         else:
             fig = plt.gcf()
             ax_mag = None
diff --git a/control/iosys.py b/control/iosys.py
@@ -148,7 +148,7 @@ def __init__(self, inputs=None, outputs=None, states=None, params={},
         # timebase
         self.dt = kwargs.pop('dt', config.defaults['control.default_dt'])
 
-        # Make sure there were no extraneous keyworks
+        # Make sure there were no extraneous keywords
         if kwargs:
             raise TypeError("unrecognized keywords: ", str(kwargs))
 
@@ -790,9 +790,9 @@ def __init__(self, updfcn, outfcn=None, inputs=None, outputs=None,
             params=params, dt=dt, name=name
         )
 
-        # Make sure all input arguments got parsed
+        # Make sure there were no extraneous keywords
         if kwargs:
-            raise TypeError("unknown parameters %s" % kwargs)
+            raise TypeError("unrecognized keywords: ", str(kwargs))
 
         # Check to make sure arguments are consistent
         if updfcn is None:
@@ -2134,7 +2134,8 @@ def _parse_signal_parameter(value, name, kwargs, end=False):
         value = kwargs.pop(name)
 
     if end and kwargs:
-        raise TypeError("unknown parameters %s" % kwargs)
+        raise TypeError("unrecognized keywords: ", str(kwargs))
+    
     return value
 
 
diff --git a/control/optimal.py b/control/optimal.py
@@ -154,7 +154,7 @@ def __init__(
         self.minimize_kwargs.update(kwargs.pop(
             'minimize_kwargs', config.defaults['optimal.minimize_kwargs']))
 
-        # Make sure all input arguments got parsed
+        # Make sure there were no extraneous keywords
         if kwargs:
             raise TypeError("unrecognized keyword(s): ", str(kwargs))
 
diff --git a/control/pzmap.py b/control/pzmap.py
@@ -91,7 +91,11 @@ def pzmap(sys, plot=None, grid=None, title='Pole Zero Map', **kwargs):
         import warnings
         warnings.warn("'Plot' keyword is deprecated in pzmap; use 'plot'",
                       FutureWarning)
-        plot = kwargs['Plot']
+        plot = kwargs.pop('Plot')
+
+    # Make sure there were no extraneous keywords
+    if kwargs:
+        raise TypeError("unrecognized keywords: ", str(kwargs))
 
     # Get parameter values
     plot = config._get_param('pzmap', 'plot', plot, True)
diff --git a/control/rlocus.py b/control/rlocus.py
@@ -168,6 +168,10 @@ def root_locus(sys, kvect=None, xlim=None, ylim=None,
     # Check for sisotool mode
     sisotool = False if 'sisotool' not in kwargs else True
 
+    # Make sure there were no extraneous keywords
+    if not sisotool and kwargs:
+        raise TypeError("unrecognized keywords: ", str(kwargs))
+
     # Create the Plot
     if plot:
         if sisotool:
diff --git a/control/tests/interconnect_test.py b/control/tests/interconnect_test.py
@@ -188,27 +188,27 @@ def test_interconnect_exceptions():
 
     # Unrecognized arguments
     # LinearIOSystem
-    with pytest.raises(TypeError, match="unknown parameter"):
+    with pytest.raises(TypeError, match="unrecognized keyword"):
         P = ct.LinearIOSystem(ct.rss(2, 1, 1), output_name='y')
 
     # Interconnect
-    with pytest.raises(TypeError, match="unknown parameter"):
+    with pytest.raises(TypeError, match="unrecognized keyword"):
         T = ct.interconnect((P, C, sumblk), input_name='r', output='y')
 
     # Interconnected system
-    with pytest.raises(TypeError, match="unknown parameter"):
+    with pytest.raises(TypeError, match="unrecognized keyword"):
         T = ct.InterconnectedSystem((P, C, sumblk), input_name='r', output='y')
 
     # NonlinearIOSytem
-    with pytest.raises(TypeError, match="unknown parameter"):
+    with pytest.raises(TypeError, match="unrecognized keyword"):
         nlios =  ct.NonlinearIOSystem(
             None, lambda t, x, u, params: u*u, input_count=1, output_count=1)
 
     # Summing junction
     with pytest.raises(TypeError, match="input specification is required"):
         sumblk = ct.summing_junction()
 
-    with pytest.raises(TypeError, match="unknown parameter"):
+    with pytest.raises(TypeError, match="unrecognized keyword"):
         sumblk = ct.summing_junction(input_count=2, output_count=2)
 
 
diff --git a/control/tests/trdata_test.py b/control/tests/trdata_test.py
@@ -208,7 +208,7 @@ def test_response_copy():
     assert response.input_labels == ['u']
 
     # Unknown keyword
-    with pytest.raises(ValueError, match="Unknown parameter(s)*"):
+    with pytest.raises(TypeError, match="unrecognized keywords"):
         response_bad_kw = response_mimo(input=0)
 
 
diff --git a/control/timeresp.py b/control/timeresp.py
@@ -480,9 +480,9 @@ def __call__(self, **kwargs):
             response.state_labels = _process_labels(
                 state_labels, "state", response.nstates)
 
-        # Make sure no unknown keywords were passed
-        if len(kwargs) != 0:
-            raise ValueError("Unknown parameter(s) %s" % kwargs)
+        # Make sure there were no extraneous keywords
+        if kwargs:
+            raise TypeError("unrecognized keywords: ", str(kwargs))
 
         return response
 
