Author: bugman Date: Fri Jan 11 21:31:18 2008 New Revision: 4659 URL: http://svn.gna.org/viewcvs/relax?rev=4659&view=rev Log: An import change to fix a circular import issue uncovered in the consistency_tests_1.3 branch. This was uncovered by Seb. See the thread starting at https://mail.gna.org/public/relax-devel/2008-01/msg00042.html. Modified: 1.3/generic_fns/pipes.py Modified: 1.3/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pipes.py?rev=4659&r1=4658&r2=4659&view=diff ============================================================================== --- 1.3/generic_fns/pipes.py (original) +++ 1.3/generic_fns/pipes.py Fri Jan 11 21:31:18 2008 @@ -23,7 +23,13 @@ # relax module imports. from data import Data as relax_data_store from relax_errors import RelaxError, RelaxNoPipeError, RelaxPipeError -from specific_fns.relax_fit import C_module_exp_fn + +# Relaxation curve fitting modules compilation test. +C_module_exp_fn = 1 +try: + from maths_fns.relax_fit import func +except ImportError: + C_module_exp_fn = 0 # The relax data storage object.