fix converstion exceptions to be TypeError

murrayrm · murrayrm · commit 94b62098d1f1 · 2021-01-07T21:50:57.000-08:00
diff --git a/control/iosys.py b/control/iosys.py
@@ -220,7 +220,7 @@ def __mul__(sys2, sys1):
             raise NotImplemented("Matrix multiplication not yet implemented")
 
         elif not isinstance(sys1, InputOutputSystem):
-            raise ValueError("Unknown I/O system object ", sys1)
+            raise TypeError("Unknown I/O system object ", sys1)
 
         # Make sure systems can be interconnected
         if sys1.noutputs != sys2.ninputs:
@@ -263,7 +263,7 @@ def __rmul__(sys1, sys2):
             raise NotImplemented("Matrix multiplication not yet implemented")
 
         elif not isinstance(sys2, InputOutputSystem):
-            raise ValueError("Unknown I/O system object ", sys1)
+            raise TypeError("Unknown I/O system object ", sys1)
 
         else:
             # Both systems are InputOutputSystems => use __mul__
@@ -281,7 +281,7 @@ def __add__(sys1, sys2):
             raise NotImplemented("Matrix addition not yet implemented")
 
         elif not isinstance(sys2, InputOutputSystem):
-            raise ValueError("Unknown I/O system object ", sys2)
+            raise TypeError("Unknown I/O system object ", sys2)
 
         # Make sure number of input and outputs match
         if sys1.ninputs != sys2.ninputs or sys1.noutputs != sys2.noutputs:
diff --git a/control/statesp.py b/control/statesp.py
@@ -1281,11 +1281,8 @@ def _convert_to_statespace(sys, **kw):
     try:
         D = _ssmatrix(sys)
         return StateSpace([], [], [], D)
-    except Exception as e:
-        print("Failure to assume argument is matrix-like in"
-              " _convert_to_statespace, result %s" % e)
-
-    raise TypeError("Can't convert given type to StateSpace system.")
+    except:
+        raise TypeError("Can't convert given type to StateSpace system.")
 
 
 # TODO: add discrete time option
diff --git a/control/xferfcn.py b/control/xferfcn.py
@@ -1290,11 +1290,8 @@ def _convert_to_transfer_function(sys, **kw):
         num = [[[D[i, j]] for j in range(inputs)] for i in range(outputs)]
         den = [[[1] for j in range(inputs)] for i in range(outputs)]
         return TransferFunction(num, den)
-    except Exception as e:
-        print("Failure to assume argument is matrix-like in"
-              " _convertToTransferFunction, result %s" % e)
-
-    raise TypeError("Can't convert given type to TransferFunction system.")
+    except:
+        raise TypeError("Can't convert given type to TransferFunction system.")
 
 
 def tf(*args, **kwargs):
