Author: bugman Date: Thu Nov 22 17:50:39 2007 New Revision: 3826 URL: http://svn.gna.org/viewcvs/relax?rev=3826&view=rev Log: Bug fix for the generic_fns.sequence.validate_sequence() function. Modified: 1.3/generic_fns/sequence.py Modified: 1.3/generic_fns/sequence.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/sequence.py?rev=3826&r1=3825&r2=3826&view=diff ============================================================================== --- 1.3/generic_fns/sequence.py (original) +++ 1.3/generic_fns/sequence.py Thu Nov 22 17:50:39 2007 @@ -123,55 +123,55 @@ """ # Loop over the data. - for i in xrange(len(file_data)): + for i in xrange(len(data)): # Molecule name data. if mol_name_col != None: try: - file_data[i][mol_name_col] - except IndexError: - raise RelaxInvalidSeqError, file_data[i] + data[i][mol_name_col] + except IndexError: + raise RelaxInvalidSeqError, data[i] # Residue number data. if res_num_col != None: # No data in column. try: - file_data[i][res_num_col] - except IndexError: - raise RelaxInvalidSeqError, file_data[i] + data[i][res_num_col] + except IndexError: + raise RelaxInvalidSeqError, data[i] # Bad data in column. try: - int(file_data[i][res_num_col]) + int(data[i][res_num_col]) except ValueError: - raise RelaxInvalidSeqError, file_data[i] + raise RelaxInvalidSeqError, data[i] # Residue name data. if res_name_col != None: try: - file_data[i][res_name_col] - except IndexError: - raise RelaxInvalidSeqError, file_data[i] + data[i][res_name_col] + except IndexError: + raise RelaxInvalidSeqError, data[i] # Spin number data. if spin_num_col != None: # No data in column. try: - file_data[i][spin_num_col] - except IndexError: - raise RelaxInvalidSeqError, file_data[i] + data[i][spin_num_col] + except IndexError: + raise RelaxInvalidSeqError, data[i] # Bad data in column. try: - int(file_data[i][spin_num_col]) + int(data[i][spin_num_col]) except ValueError: - raise RelaxInvalidSeqError, file_data[i] + raise RelaxInvalidSeqError, data[i] # Spin name data. if spin_name_col != None: try: - file_data[i][spin_name_col] - except IndexError: - raise RelaxInvalidSeqError, file_data[i] + data[i][spin_name_col] + except IndexError: + raise RelaxInvalidSeqError, data[i]