[Scipy-svn] r2594 - in trunk/Lib/odr: . tests

scipy-svn at scipy.org scipy-svn at scipy.org
Tue Jan 23 13:33:59 CST 2007


Author: jarrod.millman
Date: 2007-01-23 13:33:57 -0600 (Tue, 23 Jan 2007)
New Revision: 2594

Modified:
   trunk/Lib/odr/models.py
   trunk/Lib/odr/tests/test_odrpack.py
Log:
Fix import location of scipy.odr


Modified: trunk/Lib/odr/models.py
===================================================================
--- trunk/Lib/odr/models.py	2007-01-23 18:16:28 UTC (rev 2593)
+++ trunk/Lib/odr/models.py	2007-01-23 19:33:57 UTC (rev 2594)
@@ -1,9 +1,8 @@
 """ Collection of Model instances for use with the odrpack fitting package.
 """
 
-# Scipy imports.
-from scipy.sandbox.odr.odrpack import Model
 import numpy as np
+from scipy.odr.odrpack import Model
 
 
 def _lin_fcn(B, x):

Modified: trunk/Lib/odr/tests/test_odrpack.py
===================================================================
--- trunk/Lib/odr/tests/test_odrpack.py	2007-01-23 18:16:28 UTC (rev 2593)
+++ trunk/Lib/odr/tests/test_odrpack.py	2007-01-23 19:33:57 UTC (rev 2594)
@@ -7,7 +7,7 @@
 import numpy as np
 from numpy import pi
 from numpy.testing import assert_array_almost_equal
-from scipy.sandbox.odr import Data, Model, ODR, RealData, odr_stop
+from scipy.odr import Data, Model, ODR, RealData, odr_stop
 
 
 class ODRTestCase(unittest.TestCase):



More information about the Scipy-svn mailing list