r17624 - /trunk/generic_fns/sequence.py -- October 01, 2012 - 21:33

Author: bugman
Date: Mon Oct  1 21:33:21 2012
New Revision: 17624

URL: http://svn.gna.org/viewcvs/relax?rev=17624&view=rev
Log:
Python 3 - removed the use of the types module from generic_fns.sequence.

The relax arg_check module is now being used instead.


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=17624&r1=17623&r2=17624&view=diff
==============================================================================
--- trunk/generic_fns/sequence.py (original)
+++ trunk/generic_fns/sequence.py Mon Oct  1 21:33:21 2012
@@ -22,10 +22,8 @@
 # Module docstring.
 """Module for handling the molecule, residue, and spin sequence."""
 
-# Python module imports
-from types import IntType, NoneType
-
 # relax module imports.
+from arg_check import is_int
 from generic_fns.interatomic import return_interatom_list
 from generic_fns.mol_res_spin import count_molecules, count_residues, 
count_spins, create_molecule, create_residue, create_spin, 
exists_mol_res_spin_data, generate_spin_id, return_molecule, return_residue, 
return_spin, set_spin_element, set_spin_isotope, spin_id_to_data_list, 
spin_loop
 import pipes
@@ -371,7 +369,7 @@
         # Bad data in column.
         try:
             res_num = eval(data[res_num_col-1])
-            if not (isinstance(res_num, NoneType) or isinstance(res_num, 
IntType)):
+            if not (is_none(res_num, raise_error=False) 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])
@@ -390,7 +388,7 @@
         # Bad data in column.
         try:
             res_num = eval(data[res_num_col-1])
-            if not (isinstance(res_num, NoneType) or isinstance(res_num, 
IntType)):
+            if not (is_none(res_num, raise_error=False) 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])