updated exception handling to be python2.6+ and python3 compatible

murrayrm · murrayrm · commit 9642d11b97e1 · 2013-06-25T06:07:45.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-24  Richard Murray  <murray@altura-2.local>
+
+	* tests/minreal_test.py (TestMinreal.testMinrealBrute),
+	src/xferfcn.py (_convertToTransferFunction), src/statesp.py
+	(StateSpace.__rmul__), src/margins.py (stability_margins): changed
+	exception syntax to be python3 compatibile (works for python2.6+)
+	
 2013-06-10  Richard Murray  <murray@altura-2.local>
 
 	* src/xferfcn.py (TransferFunction.horner): small fix to docstring
diff --git a/src/margins.py b/src/margins.py
@@ -127,7 +127,7 @@ def stability_margins(sysdata, deg=True, returnall=False, epsw=1e-12):
             sys = frdata.FRD(mag*np.exp((1j/360.)*phase), omega, smooth=True)
         else:
             sys = xferfcn._convertToTransferFunction(sysdata)
-    except Exception, e:
+    except Exception as e:
         print (e)
         raise ValueError("Margin sysdata must be either a linear system or "
                          "a 3-sequence of mag, phase, omega.")
diff --git a/src/statesp.py b/src/statesp.py
@@ -351,7 +351,7 @@ def __rmul__(self, other):
             D = X * self.D
             return StateSpace(self.A, self.B, C, D, self.dt)
 
-        except Exception, e:
+        except Exception as e:
             print(e)
             pass
         raise TypeError("can't interconnect systems")
diff --git a/src/xferfcn.py b/src/xferfcn.py
@@ -1053,7 +1053,7 @@ def _convertToTransferFunction(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, e: 
+    except Exception as e: 
         print("Failure to assume argument is matrix-like in" 
               " _convertToTransferFunction, result %s" % e)
         
diff --git a/tests/minreal_test.py b/tests/minreal_test.py
@@ -53,7 +53,7 @@ def testMinrealBrute(self):
                             self.assert_numden_almost_equal(
                                 ht1.num[0][0], ht2.num[0][0], 
                                 ht1.den[0][0], ht2.den[0][0])
-                        except Exception, e:
+                        except Exception as e:
                             # for larger systems, the tf minreal's 
                             # the original rss, but not the balanced one
                             if n < 6:
