r26506 - in /trunk/extern/numdifftools: nd_scientific.py test/testnumdifftools.py -- November 11, 2014 - 10:04

Author: bugman
Date: Tue Nov 11 10:04:21 2014
New Revision: 26506

URL: http://svn.gna.org/viewcvs/relax?rev=26506&view=rev
Log:
Python 3 fixes using 2to3 for the extern.numdifftools package.

The command used was:
2to3 -j 4 -w -f except -f import -f imports -f long -f numliterals -f xrange .


Modified:
    trunk/extern/numdifftools/nd_scientific.py
    trunk/extern/numdifftools/test/testnumdifftools.py

Modified: trunk/extern/numdifftools/nd_scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/numdifftools/nd_scientific.py?rev=26506&r1=26505&r2=26506&view=diff
==============================================================================
--- trunk/extern/numdifftools/nd_scientific.py  (original)
+++ trunk/extern/numdifftools/nd_scientific.py  Tue Nov 11 10:04:21 2014
@@ -25,7 +25,7 @@
         x = np.atleast_1d(x0)
         DerivVar = SFD.DerivVar if self.derOrder > 1 else SFF.DerivVar
         der = self.fun(DerivVar(x, 0, self.derOrder))[self.derOrder][0]
-        for _i in xrange(self.derOrder - 1):
+        for _i in range(self.derOrder - 1):
             der = der[0]
         return der
 

Modified: trunk/extern/numdifftools/test/testnumdifftools.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/numdifftools/test/testnumdifftools.py?rev=26506&r1=26505&r2=26506&view=diff
==============================================================================
--- trunk/extern/numdifftools/test/testnumdifftools.py  (original)
+++ trunk/extern/numdifftools/test/testnumdifftools.py  Tue Nov 11 10:04:21 
2014
@@ -105,7 +105,7 @@
 
     def test_derivative_poly1d(self):
         # Specify the step size (default stepsize = 0.1)
-        p0 = np.poly1d(range(1, 6))
+        p0 = np.poly1d(list(range(1, 6)))
         fd = nd.Derivative(p0, n=4, romberg_terms=0) #, step_max=3, 
step_num=10)
         p4 = p0.deriv(4)
         self.assertAlmostEqual(fd(1), p4(1), places=5)