Author: bugman
Date: Fri Mar 2 06:56:34 2007
New Revision: 3069
URL: http://svn.gna.org/viewcvs/relax?rev=3069&view=rev
Log:
Added import statements for the RelaxError and RelaxWarning systems to all
the prompt modules.
Modified:
branches/error_import/prompt/angles.py
branches/error_import/prompt/command.py
branches/error_import/prompt/dasha.py
branches/error_import/prompt/diffusion_tensor.py
branches/error_import/prompt/dx.py
branches/error_import/prompt/eliminate.py
branches/error_import/prompt/fix.py
branches/error_import/prompt/grace.py
branches/error_import/prompt/jw_mapping.py
branches/error_import/prompt/minimisation.py
branches/error_import/prompt/model_free.py
branches/error_import/prompt/model_selection.py
branches/error_import/prompt/molmol.py
branches/error_import/prompt/monte_carlo.py
branches/error_import/prompt/noe.py
branches/error_import/prompt/nuclei.py
branches/error_import/prompt/palmer.py
branches/error_import/prompt/pymol.py
branches/error_import/prompt/relax_data.py
branches/error_import/prompt/relax_fit.py
branches/error_import/prompt/results.py
branches/error_import/prompt/run.py
branches/error_import/prompt/select.py
branches/error_import/prompt/sequence.py
branches/error_import/prompt/state.py
branches/error_import/prompt/structure.py
branches/error_import/prompt/thread.py
branches/error_import/prompt/unselect.py
branches/error_import/prompt/value.py
branches/error_import/prompt/vmd.py
Modified: branches/error_import/prompt/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/angles.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/angles.py (original)
+++ branches/error_import/prompt/angles.py Fri Mar 2 06:56:34 2007
@@ -21,6 +21,8 @@
###############################################################################
import sys
+
+from relax_errors import RelaxStrError
class Angles:
Modified: branches/error_import/prompt/command.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/command.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/command.py (original)
+++ branches/error_import/prompt/command.py Fri Mar 2 06:56:34 2007
@@ -22,6 +22,8 @@
import os
+
+from relax_errors import RelaxStrError
class Lh:
Modified: branches/error_import/prompt/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/dasha.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/dasha.py (original)
+++ branches/error_import/prompt/dasha.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxNoneStrError, RelaxStrError
class Dasha:
Modified: branches/error_import/prompt/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/diffusion_tensor.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/diffusion_tensor.py (original)
+++ branches/error_import/prompt/diffusion_tensor.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxError, RelaxFloatError,
RelaxIntError, RelaxNoneStrError, RelaxNumTupleError, RelaxStrError
class Diffusion_tensor:
Modified: branches/error_import/prompt/dx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/dx.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/dx.py (original)
+++ branches/error_import/prompt/dx.py Fri Mar 2 06:56:34 2007
@@ -22,6 +22,8 @@
import sys
from types import FunctionType
+
+from relax_errors import RelaxBinError, RelaxError, RelaxFunctionError,
RelaxIntError, RelaxLenError, RelaxListError, RelaxListNumError,
RelaxListStrError, RelaxNoneIntError, RelaxNoneStrError, RelaxStrError
from doc_string import regexp_doc
import help
Modified: branches/error_import/prompt/eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/eliminate.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/eliminate.py (original)
+++ branches/error_import/prompt/eliminate.py Fri Mar 2 06:56:34 2007
@@ -21,6 +21,8 @@
###############################################################################
import sys
+
+from relax_errors import RelaxFunctionError, RelaxListStrError,
RelaxNoneStrListError, RelaxNoneTupleError
from specific_fns.model_free import Model_free
Modified: branches/error_import/prompt/fix.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/fix.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/fix.py (original)
+++ branches/error_import/prompt/fix.py Fri Mar 2 06:56:34 2007
@@ -21,6 +21,8 @@
###############################################################################
import sys
+
+from relax_errors import RelaxBinError, RelaxIntStrError, RelaxStrError
class Fix:
Modified: branches/error_import/prompt/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/grace.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/grace.py (original)
+++ branches/error_import/prompt/grace.py Fri Mar 2 06:56:34 2007
@@ -21,6 +21,8 @@
###############################################################################
import sys
+
+from relax_errors import RelaxBinError, RelaxNoneIntStrError,
RelaxNoneStrError, RelaxStrError
from doc_string import regexp_doc
import help
Modified: branches/error_import/prompt/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/jw_mapping.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/jw_mapping.py (original)
+++ branches/error_import/prompt/jw_mapping.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxStrError
class Jw_mapping:
Modified: branches/error_import/prompt/minimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/minimisation.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/minimisation.py (original)
+++ branches/error_import/prompt/minimisation.py Fri Mar 2 06:56:34 2007
@@ -22,6 +22,8 @@
from string import split
import sys
+
+from relax_errors import RelaxBinError, RelaxError, RelaxIntError,
RelaxIntListIntError, RelaxListError, RelaxListNumError, RelaxNoneError,
RelaxNoneNumError, RelaxNumError, RelaxStrError
from minimise.generic import generic_minimise
Modified: branches/error_import/prompt/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/model_free.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/model_free.py (original)
+++ branches/error_import/prompt/model_free.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxIntError, RelaxListError, RelaxListStrError,
RelaxNoneIntError, RelaxStrError
class Model_free:
Modified: branches/error_import/prompt/model_selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/model_selection.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/model_selection.py (original)
+++ branches/error_import/prompt/model_selection.py Fri Mar 2 06:56:34 2007
@@ -21,6 +21,8 @@
###############################################################################
import sys
+
+from relax_errors import RelaxError, RelaxNoneListError, RelaxStrError
class Modsel:
Modified: branches/error_import/prompt/molmol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/molmol.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/molmol.py (original)
+++ branches/error_import/prompt/molmol.py Fri Mar 2 06:56:34 2007
@@ -24,6 +24,7 @@
from colour import Colour
import help
+from relax_errors import RelaxBinError, RelaxListNumError,
RelaxNoneStrError, RelaxNoneStrListError, RelaxStrError
from specific_fns.model_free import Molmol
Modified: branches/error_import/prompt/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/monte_carlo.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/monte_carlo.py (original)
+++ branches/error_import/prompt/monte_carlo.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxIntError, RelaxNumError, RelaxStrError
class Monte_carlo:
Modified: branches/error_import/prompt/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/noe.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/noe.py (original)
+++ branches/error_import/prompt/noe.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxNoneIntError, RelaxNoneIntStrError,
RelaxNoneStrError, RelaxNumError, RelaxStrError
class Noe:
Modified: branches/error_import/prompt/nuclei.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/nuclei.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/nuclei.py (original)
+++ branches/error_import/prompt/nuclei.py Fri Mar 2 06:56:34 2007
@@ -21,6 +21,8 @@
###############################################################################
import sys
+
+from relax_errors import RelaxStrError
class Nuclei:
Modified: branches/error_import/prompt/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/palmer.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/palmer.py (original)
+++ branches/error_import/prompt/palmer.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxFloatError, RelaxIntError,
RelaxNoneStrError, RelaxStrError
class Palmer:
Modified: branches/error_import/prompt/pymol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/pymol.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/pymol.py (original)
+++ branches/error_import/prompt/pymol.py Fri Mar 2 06:56:34 2007
@@ -24,6 +24,7 @@
from colour import Colour
import help
+from relax_errors import RelaxBinError, RelaxListNumError,
RelaxNoneStrError, RelaxNoneStrListError, RelaxStrError
class Pymol:
Modified: branches/error_import/prompt/relax_data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/relax_data.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/relax_data.py (original)
+++ branches/error_import/prompt/relax_data.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxFloatError, RelaxIntError,
RelaxNoneStrError, RelaxStrError
class Relax_data:
Modified: branches/error_import/prompt/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/relax_fit.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/relax_fit.py (original)
+++ branches/error_import/prompt/relax_fit.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxFloatError, RelaxNoneIntError,
RelaxNoneStrError, RelaxStrError
class Relax_fit:
Modified: branches/error_import/prompt/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/results.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/results.py (original)
+++ branches/error_import/prompt/results.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxIntError, RelaxNoneStrError,
RelaxStrError
class Results:
Modified: branches/error_import/prompt/run.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/run.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/run.py (original)
+++ branches/error_import/prompt/run.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxListStrError, RelaxNoneListError,
RelaxNoneStrError, RelaxStrError
class Run:
Modified: branches/error_import/prompt/select.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/select.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/select.py (original)
+++ branches/error_import/prompt/select.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxError, RelaxIntError,
RelaxListStrError, RelaxNoneIntStrError, RelaxNoneStrError,
RelaxNoneStrListError, RelaxStrError
class Select:
Modified: branches/error_import/prompt/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/sequence.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/sequence.py (original)
+++ branches/error_import/prompt/sequence.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxIntError, RelaxNoneStrError,
RelaxStrError
class Sequence:
Modified: branches/error_import/prompt/state.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/state.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/state.py (original)
+++ branches/error_import/prompt/state.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxIntError, RelaxNoneStrError,
RelaxStrError
class State:
Modified: branches/error_import/prompt/structure.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/structure.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/structure.py (original)
+++ branches/error_import/prompt/structure.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxFloatError, RelaxIntError,
RelaxNoneIntError, RelaxNoneStrError, RelaxStrError
class Structure:
Modified: branches/error_import/prompt/thread.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/thread.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/thread.py (original)
+++ branches/error_import/prompt/thread.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxNoneStrError, RelaxStrError
class Threading:
Modified: branches/error_import/prompt/unselect.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/unselect.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/unselect.py (original)
+++ branches/error_import/prompt/unselect.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxBinError, RelaxError, RelaxIntError,
RelaxListStrError, RelaxNoneIntStrError, RelaxNoneStrError,
RelaxNoneStrListError, RelaxStrError
class Unselect:
Modified: branches/error_import/prompt/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/value.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/value.py (original)
+++ branches/error_import/prompt/value.py Fri Mar 2 06:56:34 2007
@@ -22,6 +22,8 @@
import sys
+from relax_errors import RelaxBinError, RelaxError, RelaxFloatError,
RelaxIntError, RelaxListFloatError, RelaxListStrError,
RelaxNoneFloatListError, RelaxNoneIntError, RelaxNoneIntStrError,
RelaxNoneStrError, RelaxNoneStrListError, RelaxStrError
+
from doc_string import regexp_doc
import help
from generic_fns.diffusion_tensor import Diffusion_tensor
Modified: branches/error_import/prompt/vmd.py
URL:
http://svn.gna.org/viewcvs/relax/branches/error_import/prompt/vmd.py?rev=3069&r1=3068&r2=3069&view=diff
==============================================================================
--- branches/error_import/prompt/vmd.py (original)
+++ branches/error_import/prompt/vmd.py Fri Mar 2 06:56:34 2007
@@ -23,6 +23,7 @@
import sys
import help
+from relax_errors import RelaxStrError
class Vmd:
r3069 - /branches/error_import/prompt/