r3060 - in /branches/error_import: generic_fns/runs.py specific_fns/relax_fit.py -- March 02, 2007 - 05:15

Author: bugman
Date: Fri Mar  2 05:14:28 2007
New Revision: 3060

URL: http://svn.gna.org/viewcvs/relax?rev=3060&view=rev
Log:
Removed the variable 'C_module_exp_fn' from __builtin__.

See the thread starting at 
https://mail.gna.org/public/relax-devel/2007-02/msg00003.html
(Message-id: <45DACFEA.7020108@xxxxxxxxxxxxxxx>) for a discussion of the 
issue.

Rathar than placing the 'C_module_exp_fn' variable into __builtin__ from the 
specific_fns.relax_fit
module, it is now placed into the global namespace of that module.  The 
generic_fns.runs module then
simply imports the variable.


Modified:
    branches/error_import/generic_fns/runs.py
    branches/error_import/specific_fns/relax_fit.py

Modified: branches/error_import/generic_fns/runs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/error_import/generic_fns/runs.py?rev=3060&r1=3059&r2=3060&view=diff
==============================================================================
--- branches/error_import/generic_fns/runs.py (original)
+++ branches/error_import/generic_fns/runs.py Fri Mar  2 05:14:28 2007
@@ -21,6 +21,7 @@
 
###############################################################################
 
 from copy import deepcopy
+from specific_fns.relax_fit import C_module_exp_fn
 
 
 class Runs:

Modified: branches/error_import/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/relax_fit.py?rev=3060&r1=3059&r2=3060&view=diff
==============================================================================
--- branches/error_import/specific_fns/relax_fit.py (original)
+++ branches/error_import/specific_fns/relax_fit.py Fri Mar  2 05:14:28 2007
@@ -20,7 +20,6 @@
 #                                                                            
 #
 
###############################################################################
 
-import __builtin__
 from LinearAlgebra import inverse
 from math import sqrt
 from Numeric import Float64, array, average, identity, matrixmultiply, zeros
@@ -35,9 +34,9 @@
     from maths_fns.relax_fit import setup, func, dfunc, d2func, back_calc_I
 except ImportError:
     sys.stderr.write("\nImportError: relaxation curve fitting is 
unavailible, try compiling the C modules.\n")
-    __builtin__.C_module_exp_fn = 0
+    C_module_exp_fn = 0
 else:
-    __builtin__.C_module_exp_fn = 1
+    C_module_exp_fn = 1
 
 
 class Relax_fit(Common_functions):