r4660 - in /branches/consistency_tests_1.3: ./ generic_fns/pipes.py -- January 11, 2008 - 21:40

Author: semor
Date: Fri Jan 11 21:40:27 2008
New Revision: 4660

URL: http://svn.gna.org/viewcvs/relax?rev=4660&view=rev
Log:
Merged revisions 4659 via svnmerge from 
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3

........
  r4659 | bugman | 2008-01-11 15:31:18 -0500 (Fri, 11 Jan 2008) | 6 lines
  
  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:
    branches/consistency_tests_1.3/   (props changed)
    branches/consistency_tests_1.3/generic_fns/pipes.py

Propchange: branches/consistency_tests_1.3/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 11 21:40:27 2008
@@ -1,1 +1,1 @@
-/1.3:1-3320,3333-4175,4223,4241-4335,4338-4433,4440-4461,4473,4476-4493,4523-4551,4567-4577,4579,4585-4586,4618-4623
+/1.3:1-3320,3333-4175,4223,4241-4335,4338-4433,4440-4461,4473,4476-4493,4523-4551,4567-4577,4579,4585-4586,4618-4623,4659

Modified: branches/consistency_tests_1.3/generic_fns/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/pipes.py?rev=4660&r1=4659&r2=4660&view=diff
==============================================================================
--- branches/consistency_tests_1.3/generic_fns/pipes.py (original)
+++ branches/consistency_tests_1.3/generic_fns/pipes.py Fri Jan 11 21:40:27 
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.