r17644 - /trunk/generic_fns/sequence.py -- October 02, 2012 - 01:16

Author: bugman
Date: Tue Oct  2 01:16:44 2012
New Revision: 17644

URL: http://svn.gna.org/viewcvs/relax?rev=17644&view=rev
Log:
Fix for a bug introduced at r17624 in the 
generic_fns.sequence.validate_sequence() function.

The is_none() function call doesn't seem to be working correctly.


Modified:
    trunk/generic_fns/sequence.py

Modified: trunk/generic_fns/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/sequence.py?rev=17644&r1=17643&r2=17644&view=diff
==============================================================================
--- trunk/generic_fns/sequence.py (original)
+++ trunk/generic_fns/sequence.py Tue Oct  2 01:16:44 2012
@@ -369,7 +369,7 @@
         # Bad data in column.
         try:
             res_num = eval(data[res_num_col-1])
-            if not (is_none(res_num, raise_error=False) or is_int(res_num, 
raise_error=False)):
+            if not (res_num == None or is_int(res_num, raise_error=False)):
                 raise ValueError
         except:
             raise RelaxInvalidSeqError(data, "the residue number data '%s' 
is invalid" % data[res_num_col-1])
@@ -388,7 +388,7 @@
         # Bad data in column.
         try:
             res_num = eval(data[res_num_col-1])
-            if not (is_none(res_num, raise_error=False) or is_int(res_num, 
raise_error=False)):
+            if not (res_num == None or is_int(res_num, raise_error=False)):
                 raise ValueError
         except:
             raise RelaxInvalidSeqError(data, "the spin number data '%s' is 
invalid" % data[res_num_col-1])