Author: bugman
Date: Fri Mar 2 06:36:27 2007
New Revision: 3067
URL: http://svn.gna.org/viewcvs/relax?rev=3067&view=rev
Log:
Added import statements for the RelaxError and RelaxWarning systems to all
the specific_fns modules.
Modified:
branches/error_import/specific_fns/base_class.py
branches/error_import/specific_fns/hybrid.py
branches/error_import/specific_fns/jw_mapping.py
branches/error_import/specific_fns/model_free.py
branches/error_import/specific_fns/noe.py
branches/error_import/specific_fns/relax_data.py
branches/error_import/specific_fns/relax_fit.py
branches/error_import/specific_fns/specific_setup.py
Modified: branches/error_import/specific_fns/base_class.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/base_class.py?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/base_class.py (original)
+++ branches/error_import/specific_fns/base_class.py Fri Mar 2 06:36:27 2007
@@ -21,6 +21,8 @@
###############################################################################
from copy import deepcopy
+
+from relax_errors import RelaxError
class Common_functions:
Modified: branches/error_import/specific_fns/hybrid.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/hybrid.py?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/hybrid.py (original)
+++ branches/error_import/specific_fns/hybrid.py Fri Mar 2 06:36:27 2007
@@ -19,6 +19,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
#
###############################################################################
+
+from relax_errors import RelaxError, RelaxNoRunError, RelaxNoSequenceError,
RelaxRunError, RelaxSequenceError
class Hybrid:
Modified: branches/error_import/specific_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/jw_mapping.py?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/jw_mapping.py (original)
+++ branches/error_import/specific_fns/jw_mapping.py Fri Mar 2 06:36:27 2007
@@ -25,6 +25,7 @@
from base_class import Common_functions
from maths_fns.jw_mapping import Mapping
+from relax_errors import RelaxError, RelaxFuncSetupError, RelaxNoRunError,
RelaxNoSequenceError, RelaxNoValueError, RelaxNucleusError
class Jw_mapping(Common_functions):
Modified: branches/error_import/specific_fns/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/model_free.py?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/model_free.py (original)
+++ branches/error_import/specific_fns/model_free.py Fri Mar 2 06:36:27 2007
@@ -30,9 +30,10 @@
import sys
from base_class import Common_functions
+from float import isNaN,isInf
from maths_fns.mf import Mf
from minimise.generic import generic_minimise
-from float import isNaN,isInf
+from relax_errors import RelaxError, RelaxFuncSetupError, RelaxInfError,
RelaxInvalidDataError, RelaxLenError, RelaxNaNError, RelaxNoModelError,
RelaxNoPdbError, RelaxNoResError, RelaxNoRunError, RelaxNoSequenceError,
RelaxNoTensorError, RelaxNoValueError, RelaxNoVectorsError,
RelaxNucleusError, RelaxStyleError, RelaxTensorError,
RelaxUnknownDataTypeError
class Model_free(Common_functions):
Modified: branches/error_import/specific_fns/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/noe.py?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/noe.py (original)
+++ branches/error_import/specific_fns/noe.py Fri Mar 2 06:36:27 2007
@@ -22,6 +22,8 @@
from math import sqrt
from re import match
+
+from relax_errors import RelaxArgNotInListError, RelaxError,
RelaxInvalidDataError, RelaxNoRunError, RelaxNoSequenceError, RelaxRegExpError
class Noe:
Modified: branches/error_import/specific_fns/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/relax_data.py?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/relax_data.py (original)
+++ branches/error_import/specific_fns/relax_data.py Fri Mar 2 06:36:27 2007
@@ -23,6 +23,8 @@
from copy import deepcopy
import sys
+from relax_errors import RelaxError, RelaxNoResError, RelaxNoRiError,
RelaxNoRunError, RelaxNoSequenceError, RelaxRiError
+
class Rx_data:
def __init__(self, relax):
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=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/relax_fit.py (original)
+++ branches/error_import/specific_fns/relax_fit.py Fri Mar 2 06:36:27 2007
@@ -28,6 +28,8 @@
from base_class import Common_functions
from minimise.generic import generic_minimise
+from relax_errors import RelaxError, RelaxFuncSetupError, RelaxLenError,
RelaxNoModelError, RelaxNoRunError, RelaxNoSequenceError
+
# C modules.
try:
Modified: branches/error_import/specific_fns/specific_setup.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/specific_fns/specific_setup.py?rev=3067&r1=3066&r2=3067&view=diff
==============================================================================
--- branches/error_import/specific_fns/specific_setup.py (original)
+++ branches/error_import/specific_fns/specific_setup.py Fri Mar 2 06:36:27
2007
@@ -22,6 +22,8 @@
from re import match
+
+from relax_errors import RelaxFuncSetupError
class Specific_setup:
r3067 - /branches/error_import/specific_fns/