switching to having both __div__ and __truediv__ defined for the

repagh · repagh · commit 0ba67cc385a9 · 2013-07-16T14:59:20.000Z
python 2-&gt;3 transition period
diff --git a/src/frdata.py b/src/frdata.py
@@ -18,6 +18,8 @@
 FRD.__rsub__
 FRD.__mul__
 FRD.__rmul__
+FRD.__div__
+FRD.__rdiv__
 FRD.__truediv__
 FRD.__rtruediv__
 FRD.evalfr
@@ -305,6 +307,10 @@ def __truediv__(self, other):
                 "FRD.__truediv__ is currently implemented only for SISO systems.")
         
         return FRD(self.fresp/other.fresp, self.omega)
+
+    # TODO: Remove when transition to python3 complete
+    def __div__(self, other):
+        return self.__truediv__(other)
        
     # TODO: Division of MIMO transfer function objects is not written yet.
     def __rtruediv__(self, other):
@@ -321,6 +327,9 @@ def __rtruediv__(self, other):
 
         return other / self
 
+    # TODO: Remove when transition to python3 complete
+    def __rdiv__(self, other):
+        return self.__rtruediv__(other)
 
     def __pow__(self,other):
         if not type(other) == int:
diff --git a/src/xferfcn.py b/src/xferfcn.py
@@ -21,6 +21,8 @@
 TransferFunction.__rmul__
 TransferFunction.__div__
 TransferFunction.__rdiv__
+TransferFunction.__truediv__
+TransferFunction.__rtruediv__
 TransferFunction.evalfr
 TransferFunction.freqresp
 TransferFunction.pole
@@ -498,6 +500,10 @@ def __truediv__(self, other):
         den = polymul(self.den[0][0], other.num[0][0])
         
         return TransferFunction(num, den, dt)
+
+    # TODO: Remove when transition to python3 complete
+    def __div__(self, other):
+        return TransferFunction.__truediv__(self, other)
        
     # TODO: Division of MIMO transfer function objects is not written yet.
     def __rtruediv__(self, other):
@@ -515,6 +521,10 @@ def __rtruediv__(self, other):
 
         return other / self
 
+    # TODO: Remove when transition to python3 complete
+    def __rdiv__(self, other):
+        return TransferFunction.__rtruediv__(self, other)
+
     def __pow__(self,other):
         if not type(other) == int:
             raise ValueError("Exponent must be an integer")
diff --git a/tests/frd_test.py b/tests/frd_test.py
@@ -4,7 +4,6 @@
 # RvP, 4 Oct 2012
 
 
-from __future__ import division
 import unittest
 import numpy as np
 from control.statesp import StateSpace
diff --git a/tests/matlab_test.py b/tests/matlab_test.py
@@ -8,7 +8,7 @@
 # nothing crashes.  It doesn't test actual functionality; the module
 # specific unit tests will do that.
 
-from __future__ import print_function, division
+from __future__ import print_function
 import unittest
 import numpy as np
 from scipy.linalg import eigvals
diff --git a/tests/minreal_test.py b/tests/minreal_test.py
@@ -3,7 +3,6 @@
 # minreal_test.py - test state space class
 # Rvp, 13 Jun 2013
 
-from __future__ import division
 import unittest
 import numpy as np
 from scipy.linalg import eigvals
diff --git a/tests/statesp_test.py b/tests/statesp_test.py
@@ -3,7 +3,6 @@
 # statesp_test.py - test state space class
 # RMM, 30 Mar 2011 (based on TestStateSp from v0.4a)
 
-from __future__ import division
 import unittest
 import numpy as np
 from scipy.linalg import eigvals
diff --git a/tests/xferfcn_test.py b/tests/xferfcn_test.py
@@ -3,7 +3,6 @@
 # xferfcn_test.py - test TransferFunction class
 # RMM, 30 Mar 2011 (based on TestXferFcn from v0.4a)
 
-from __future__ import division
 import unittest
 import numpy as np
 from control.statesp import StateSpace, _convertToStateSpace
