r3926 - in /1.3/prompt: dx.py value.py -- November 25, 2007 - 18:18

Author: bugman
Date: Sun Nov 25 18:18:20 2007
New Revision: 3926

URL: http://svn.gna.org/viewcvs/relax?rev=3926&view=rev
Log:
Fixed the prompt modules which were importing the Diffusion_tensor class.


Modified:
    1.3/prompt/dx.py
    1.3/prompt/value.py

Modified: 1.3/prompt/dx.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/dx.py?rev=3926&r1=3925&r2=3926&view=diff
==============================================================================
--- 1.3/prompt/dx.py (original)
+++ 1.3/prompt/dx.py Sun Nov 25 18:18:20 2007
@@ -20,14 +20,15 @@
 #                                                                            
 #
 
###############################################################################
 
+# Python module imports.
 import sys
 from types import FunctionType
 
-from relax_errors import RelaxBinError, RelaxError, RelaxFunctionError, 
RelaxIntError, RelaxLenError, RelaxListError, RelaxListNumError, 
RelaxListStrError, RelaxNoneIntError, RelaxNoneStrError, RelaxStrError
-
+# relax module imports.
 from doc_string import regexp_doc
 import help
-from generic_fns.diffusion_tensor import Diffusion_tensor
+from generic_fns import diffusion_tensor
+from relax_errors import RelaxBinError, RelaxError, RelaxFunctionError, 
RelaxIntError, RelaxLenError, RelaxListError, RelaxListNumError, 
RelaxListStrError, RelaxNoneIntError, RelaxNoneStrError, RelaxStrError
 from specific_fns.model_free import Model_free
 
 
@@ -286,5 +287,5 @@
 
     # Write function.
     map.__doc__ = map.__doc__ + "\n\n" + regexp_doc() + "\n"
-    map.__doc__ = map.__doc__ + Diffusion_tensor.return_data_name.__doc__ + 
"\n\n"
+    map.__doc__ = map.__doc__ + diffusion_tensor.return_data_name.__doc__ + 
"\n\n"
     map.__doc__ = map.__doc__ + Model_free.return_data_name.__doc__ + "\n\n"

Modified: 1.3/prompt/value.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/value.py?rev=3926&r1=3925&r2=3926&view=diff
==============================================================================
--- 1.3/prompt/value.py (original)
+++ 1.3/prompt/value.py Sun Nov 25 18:18:20 2007
@@ -20,13 +20,14 @@
 #                                                                            
 #
 
###############################################################################
 
+# Python module imports.
 import sys
 
-from relax_errors import RelaxBinError, RelaxError, RelaxFloatError, 
RelaxIntError, RelaxListFloatError, RelaxListStrError, 
RelaxNoneFloatListError, RelaxNoneIntError, RelaxNoneIntStrError, 
RelaxNoneStrError, RelaxNoneStrListError, RelaxStrError
-
+# relax module imports.
 from doc_string import regexp_doc
 import help
-from generic_fns.diffusion_tensor import Diffusion_tensor
+from generic_fns import diffusion_tensor
+from relax_errors import RelaxBinError, RelaxError, RelaxFloatError, 
RelaxIntError, RelaxListFloatError, RelaxListStrError, 
RelaxNoneFloatListError, RelaxNoneIntError, RelaxNoneIntStrError, 
RelaxNoneStrError, RelaxNoneStrListError, RelaxStrError
 from specific_fns.model_free import Model_free
 from specific_fns.jw_mapping import Jw_mapping
 from specific_fns.relax_fit import Relax_fit
@@ -542,9 +543,9 @@
     set.__doc__ = set.__doc__ + Jw_mapping.set.__doc__ + "\n"
     set.__doc__ = set.__doc__ + Jw_mapping.return_data_name.__doc__ + "\n"
     set.__doc__ = set.__doc__ + Jw_mapping.default_value.__doc__ + "\n"
-    set.__doc__ = set.__doc__ + Diffusion_tensor.set.__doc__ + "\n"
-    set.__doc__ = set.__doc__ + Diffusion_tensor.return_data_name.__doc__ + 
"\n"
-    set.__doc__ = set.__doc__ + Diffusion_tensor.default_value.__doc__ + 
"\n\n"
+    set.__doc__ = set.__doc__ + diffusion_tensor.set.__doc__ + "\n"
+    set.__doc__ = set.__doc__ + diffusion_tensor.return_data_name.__doc__ + 
"\n"
+    set.__doc__ = set.__doc__ + diffusion_tensor.default_value.__doc__ + 
"\n\n"
     set.__doc__ = set.__doc__ + Relax_fit.set_doc.__doc__ + "\n"
     set.__doc__ = set.__doc__ + Relax_fit.return_data_name.__doc__ + "\n"
     set.__doc__ = set.__doc__ + Relax_fit.default_value.__doc__ + "\n\n"