r5508 - in /1.3/generic_fns: residue.py spin.py -- April 09, 2008 - 17:15

Author: bugman
Date: Wed Apr  9 17:07:24 2008
New Revision: 5508

URL: http://svn.gna.org/viewcvs/relax?rev=5508&view=rev
Log:
Fixes for the deletion of the exists_xxx() functions.

These have been replaced by calls to the is_empty() data object methods.


Modified:
    1.3/generic_fns/residue.py
    1.3/generic_fns/spin.py

Modified: 1.3/generic_fns/residue.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/residue.py?rev=5508&r1=5507&r2=5508&view=diff
==============================================================================
--- 1.3/generic_fns/residue.py (original)
+++ 1.3/generic_fns/residue.py Wed Apr  9 17:07:24 2008
@@ -23,7 +23,7 @@
 # relax module imports.
 from data import Data as relax_data_store
 from relax_errors import RelaxError, RelaxNoPipeError, 
RelaxSpinSelectDisallowError
-from selection import exists_res_data, molecule_loop, parse_token, 
residue_loop, return_molecule, return_residue, return_single_residue_info, 
tokenise
+from selection import molecule_loop, parse_token, residue_loop, 
return_molecule, return_residue, return_single_residue_info, tokenise
 
 
 # Module doc.
@@ -74,7 +74,7 @@
 
     # Test if the residue number already exists.
     res_to_cont = return_residue(res_to, pipe_to)
-    if res_to_cont and exists_res_data(res_to_cont):
+    if res_to_cont and not res_to_cont.is_empty():
         raise RelaxError, "The residue " + `res_to` + " already exists in 
the " + `pipe_to` + " data pipe."
 
     # Get the single residue data container.

Modified: 1.3/generic_fns/spin.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/spin.py?rev=5508&r1=5507&r2=5508&view=diff
==============================================================================
--- 1.3/generic_fns/spin.py (original)
+++ 1.3/generic_fns/spin.py Wed Apr  9 17:07:24 2008
@@ -23,7 +23,7 @@
 # relax module imports.
 from data import Data as relax_data_store
 from relax_errors import RelaxError, RelaxNoPipeError, 
RelaxSpinSelectDisallowError
-from selection import exists_spin_data, parse_token, residue_loop, 
return_residue, return_spin, return_single_spin_info, spin_loop, tokenise
+from selection import parse_token, residue_loop, return_residue, 
return_spin, return_single_spin_info, spin_loop, tokenise
 
 
 # Module doc.
@@ -67,7 +67,7 @@
     # Test if the spin number already exists.
     if spin_to_token:
         spin_to_cont = return_spin(spin_to, pipe_to)
-        if spin_to_cont and exists_spin_data(spin_to_cont):
+        if spin_to_cont and not spin_to_cont.is_empty():
             raise RelaxError, "The spin " + `spin_to` + " already exists in 
the " + `pipe_from` + " data pipe."
 
     # No residue to copy data from.