r14545 - in /1.3: generic_fns/sequence.py relax_errors.py -- August 31, 2011 - 14:17

Author: bugman
Date: Wed Aug 31 14:17:00 2011
New Revision: 14545

URL: http://svn.gna.org/viewcvs/relax?rev=14545&view=rev
Log:
The RelaxInvalidSeqError now prints out a more detailed message for the 
validate_sequence() fn.


Modified:
    1.3/generic_fns/sequence.py
    1.3/relax_errors.py

Modified: 1.3/generic_fns/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/sequence.py?rev=14545&r1=14544&r2=14545&view=diff
==============================================================================
--- 1.3/generic_fns/sequence.py (original)
+++ 1.3/generic_fns/sequence.py Wed Aug 31 14:17:00 2011
@@ -333,14 +333,14 @@
         try:
             data[spin_id_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the Spin ID data is missing")
 
     # Molecule name data.
     if mol_name_col:
         try:
             data[mol_name_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the molecule name data is 
missing")
 
     # Residue number data.
     if res_num_col:
@@ -348,20 +348,20 @@
         try:
             data[res_num_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the residue number data is 
missing")
 
         # Bad data in column.
         try:
             int(data[res_num_col-1])
         except ValueError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the residue number data is 
invalid")
 
     # Residue name data.
     if res_name_col:
         try:
             data[res_name_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the residue name data is 
missing")
 
     # Spin number data.
     if spin_num_col:
@@ -369,34 +369,34 @@
         try:
             data[spin_num_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the spin number data is 
missing")
 
         # Bad data in column.
         try:
             int(data[spin_num_col-1])
         except ValueError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the spin number data is 
invalid")
 
     # Spin name data.
     if spin_name_col:
         try:
             data[spin_name_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the spin name data is missing")
 
     # Data.
     if data_col:
         try:
             data[data_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the data is missing")
 
     # Errors
     if error_col:
         try:
             data[error_col-1]
         except IndexError:
-            raise RelaxInvalidSeqError(data)
+            raise RelaxInvalidSeqError(data, "the error data is missing")
 
 
 def write(file, dir=None, sep=None, mol_name_flag=False, res_num_flag=False, 
res_name_flag=False, spin_num_flag=False, spin_name_flag=False, force=False):

Modified: 1.3/relax_errors.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax_errors.py?rev=14545&r1=14544&r2=14545&view=diff
==============================================================================
--- 1.3/relax_errors.py (original)
+++ 1.3/relax_errors.py Wed Aug 31 14:17:00 2011
@@ -572,8 +572,11 @@
 
 # The sequence data is not valid.
 class RelaxInvalidSeqError(BaseError):
-    def __init__(self, line):
-        self.text = "The sequence data in the line %s is invalid." % line
+    def __init__(self, line, problem=None):
+        if problem == None:
+            self.text = "The sequence data in the line %s is invalid." % line
+        else:
+            self.text = "The sequence data in the line %s is invalid, %s." % 
(line, problem)
 
 # The spins have not been loaded
 class RelaxSpinsNotLoadedError(BaseError):