r9653 - /1.3/relax_io.py -- October 08, 2009 - 09:46

Author: bugman
Date: Thu Oct  8 09:46:39 2009
New Revision: 9653

URL: http://svn.gna.org/viewcvs/relax?rev=9653&view=rev
Log:
read_spin_data() now gives a warning rather than an error if the sequence 
data in a line is bad.


Modified:
    1.3/relax_io.py

Modified: 1.3/relax_io.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax_io.py?rev=9653&r1=9652&r2=9653&view=diff
==============================================================================
--- 1.3/relax_io.py (original)
+++ 1.3/relax_io.py Thu Oct  8 09:46:39 2009
@@ -43,11 +43,12 @@
 from string import split
 import sys
 from sys import stdin, stdout, stderr
+from warnings import warn
 
 # relax module imports.
 import generic_fns
 from generic_fns.mol_res_spin import generate_spin_id_data_array
-from relax_errors import RelaxError, RelaxFileError, RelaxFileEmptyError, 
RelaxFileOverwriteError, RelaxMissingBinaryError, RelaxNoInPathError, 
RelaxNonExecError
+from relax_errors import RelaxError, RelaxFileError, RelaxFileEmptyError, 
RelaxFileOverwriteError, RelaxInvalidSeqError, RelaxMissingBinaryError, 
RelaxNoInPathError, RelaxNonExecError
 from relax_warnings import RelaxWarning
 
 
@@ -554,7 +555,14 @@
                 continue
 
             # Validate the sequence.
-            generic_fns.sequence.validate_sequence(line, 
mol_name_col=mol_name_col, res_num_col=res_num_col, 
res_name_col=res_name_col, spin_num_col=spin_num_col, 
spin_name_col=spin_name_col)
+            try:
+                generic_fns.sequence.validate_sequence(line, 
mol_name_col=mol_name_col, res_num_col=res_num_col, 
res_name_col=res_name_col, spin_num_col=spin_num_col, 
spin_name_col=spin_name_col)
+            except RelaxInvalidSeqError, msg:
+                # Extract the message string, without the RelaxError bit.
+                string = msg.__str__()[12:-1]
+
+                # Give a warning.
+                warn(RelaxWarning(string))
 
             # Right, data is OK and exists.
             missing = False